Commit graph

2358 commits

Author SHA1 Message Date
Xin Li
f31fcb9dd8 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours am: 32953a9018 -s ours am: f34af8bb46 -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441

Change-Id: I378fc6846d8c64a0a7a8099e59cfbb62f5b13bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:07:28 +00:00
Xin Li
f34af8bb46 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours am: 32953a9018 -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441

Change-Id: I192dbf0edc60f1db233201777bef349a46f7c83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:34:36 +00:00
Xin Li
32953a9018 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441

Change-Id: I482d9b52ba5b5beb6888719e8609cd75adc73e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:20 +00:00
Yung Ti Su
4a7772f77b add mixer path for BT SCO voice call am: fb96524dc9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24632407

Change-Id: I6b47745b57aa56af3fdb4ea926e365d660258a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 02:58:18 +00:00
Yung Ti Su
fb96524dc9 add mixer path for BT SCO voice call
Bug: 297794937
Test: manual

Change-Id: I88ae3fc8290fdf83d33c71def8cb3ca705136f38
Signed-off-by: Yung Ti Su <andysu@google.com>
2023-09-01 02:26:14 +00:00
Xin Li
12032b942f Merge UP1A.230905.019
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I6a61ab7455e00e60b4944f19a6d84bf859c642a9
2023-08-31 12:12:38 -07:00
Treehugger Robot
7c15fa00d6 Merge "gps: set high accuracy shape mode and enable always-on measurements log" into udc-qpr-dev am: eb3a9d2e62
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24579394

Change-Id: I95480af639aede1de9086d861ab714b9d54c35d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 13:49:11 +00:00
Treehugger Robot
eb3a9d2e62 Merge "gps: set high accuracy shape mode and enable always-on measurements log" into udc-qpr-dev 2023-08-31 12:49:36 +00:00
Wayne Lin
0b6ddcd04b gps: set high accuracy shape mode and enable always-on measurements log
Bug: 277337710
Bug: 286158090
Test: verify pass in b/286158090#comment53 and b/277336756#comment32
Change-Id: I305b18f2e281eef0f24d7a6915a44d3b816137a7
2023-08-31 05:29:37 +00:00
Treehugger Robot
a1de289fc6 Merge "Fix overlap between smartspace and weather clock" into udc-qpr-dev am: 5ba793c2ff
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24458576

Change-Id: I19991c2e849e1b0cd949c931a3290c50a95b9510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:53:26 +00:00
Treehugger Robot
5ba793c2ff Merge "Fix overlap between smartspace and weather clock" into udc-qpr-dev 2023-08-29 20:39:37 +00:00
Xin Li
f769bfa370 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours am: f4b38e7b46 -s ours am: 4fcacced52 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I1cdd59776777d136a1c419cb7937ddd18fea70ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:16:26 +00:00
Xin Li
e4a3248e2d [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours am: b7cf79b50d -s ours am: 721d839d2a -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I6b31d13f301abb1b81fbc89dce87f95d765ecd8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:11:08 +00:00
Florian Mayer
c94c63a579 Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db am: 9c8f7cff7b am: 4165369e1c
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: I7388ae5e8ee5791b421305ff9ecd676047af20a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:00:33 +00:00
Xin Li
4fcacced52 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours am: f4b38e7b46 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I90d949caaa1be25870115a8ed82732c52aed4eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:40:44 +00:00
Xin Li
721d839d2a [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours am: b7cf79b50d -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: Iaf68020e3327bc52f0dd2141c4d5b669016d575c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:35:25 +00:00
Florian Mayer
4165369e1c Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db am: 9c8f7cff7b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: Idb24b83a65598fc76197639461a0fb4e7b7470e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:26:03 +00:00
Xin Li
f4b38e7b46 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: Ief104b9a8579ed786718adf55dfad6e0ef4a2f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:04:44 +00:00
Xin Li
b7cf79b50d [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I261bdf7ef23cfabc3ed6a0fe67b2044509d108cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:59:25 +00:00
Florian Mayer
9c8f7cff7b Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: Idac8aa35d09e6eeaa92a9125ee39ce2421ca1096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:42:54 +00:00
Xin Li
66e687a2a4 Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:12:23 +00:00
Florian Mayer
50889ad4db Add aosp_felix_hwasan am: c2556c4c61
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: I29e672a12cd2cec8bcb880c19f99dbd03fe2aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:11:26 +00:00
Florian Mayer
c2556c4c61 Add aosp_felix_hwasan
Bug: 297918380
Change-Id: I934dc696c9066bdc337a4279296b91744d0b0382
2023-08-28 13:11:01 -07:00
Yung Ti Su
5e690c0a4c [AIDL] Add mixer paths for BT am: 96c377d870
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24548399

Change-Id: I2c24b7daddd725a5a9ac98e0d9c3c694b5b345f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 18:33:11 +00:00
Yung Ti Su
96c377d870 [AIDL] Add mixer paths for BT
Bug: 293221641
Test: manual

Change-Id: I2c1ca5ca43665595639ce1f785b807e68a59ed90
Signed-off-by: Yung Ti Su <andysu@google.com>
2023-08-28 17:58:28 +00:00
Sherry Zhou
2850f8598b Fix overlap between smartspace and weather clock
Test: manually test on Felix
Bug: 286888430
Change-Id: I92286b1ef610b13b76c0f24ffe1fc3592e26fe9e
2023-08-24 21:59:22 +00:00
Joey Poomarin Phloyphisut
859e412e25 Merge "[USB Audio AIDL] Add mixer_paths for usb audio." into udc-qpr-dev am: 7dd2e35ae5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24457669

Change-Id: I930440a30126b1a8e5373e537c3e59abd6ca9fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 06:17:56 +00:00
Joey Poomarin Phloyphisut
7dd2e35ae5 Merge "[USB Audio AIDL] Add mixer_paths for usb audio." into udc-qpr-dev 2023-08-24 05:49:50 +00:00
Cheng Chang
e57fe1ee92 Merge "update the gps conf to the latest version" into udc-qpr-dev am: 7a82185421
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24398895

Change-Id: Icd4939623b15e9d019b9d94c8e744b3243b617dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 18:46:46 +00:00
Poomarin Phloyphisut
c4a811f8cd [USB Audio AIDL] Add mixer_paths for usb audio.
Test: Local Test
Bug: 274870625
Change-Id: I850679b60bc523f5e88884729d5439056dcafab3
2023-08-23 08:08:03 +00:00
Cheng Chang
7a82185421 Merge "update the gps conf to the latest version" into udc-qpr-dev 2023-08-23 07:57:32 +00:00
Cheng Chang
65597bdede update the gps conf to the latest version
Bug: 290725902
Test: verification test at b/287729267
Change-Id: I2ec07bb16c62861e1a7939733385e17ba006fdc7
2023-08-23 03:08:42 +00:00
Jason Chang
9077cf541a Merge "Adjust Power button light reveal position in line with the power button for F10" into udc-qpr-dev am: 4dc0462849
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24439411

Change-Id: I21e17d3bd6eb8369f2d80285633f82815e7973b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 07:05:07 +00:00
Jason Chang
4dc0462849 Merge "Adjust Power button light reveal position in line with the power button for F10" into udc-qpr-dev 2023-08-22 06:17:26 +00:00
Treehugger Robot
1de1296e9d Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 99e0b6fff8 am: dde3e911f2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: I52aea05bc3e4122af842df380e14e2c8561314e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 00:31:16 +00:00
Treehugger Robot
9d99bdabcb Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 99e0b6fff8 am: 47daeaeef9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: Ic888bba440d383a17b4bb55e5ee276dab301251e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:51:17 +00:00
Treehugger Robot
47daeaeef9 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 99e0b6fff8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: Icb654d8ba28c5f9e919e6cfc1b24f75b2bcbd9e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:24:22 +00:00
Treehugger Robot
dde3e911f2 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 99e0b6fff8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: Ifa72808d08ace3f377d8607627f4914019dbb1dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:18:06 +00:00
Treehugger Robot
9fcf514bbe Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 4935f7c831 am: 24f93f78c5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: I288385973e2a10e1f311d6ec169f74a831b71347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:16:57 +00:00
Treehugger Robot
24f93f78c5 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 4935f7c831
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: Id789cef46760ae032e5e3555294f680bf39118db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:52:12 +00:00
Treehugger Robot
99e0b6fff8 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: I583532535b86f8e7b771d3ca1fe0046a67ae7e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:12:09 +00:00
Treehugger Robot
4935f7c831 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: I57a146163061e0fc6f596972f809485a1e1dd543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:11:11 +00:00
Treehugger Robot
4de7df1c5e Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev 2023-08-21 21:20:40 +00:00
Lokesh Kumar Goel
310a98d2d0 Update felix SVN to 25 am: f538f8e771 am: f19d2a7074 am: 65ecd098cc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: Ic9af533bde66ec73de4fc97c3494bf875e755ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:27:57 +00:00
Lokesh Kumar Goel
1c5e4e292b Update felix SVN to 25 am: f538f8e771 am: c2ee41a877 am: 7d8a0dd069
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: If257d3acdcbed90a7890ec8ecdcef846920d235f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:26:25 +00:00
Lokesh Kumar Goel
80fd6888fc Update felix SVN to 25 am: f538f8e771 am: f19d2a7074 am: 693365379d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: Iaf713036a403ad57b759774770e12796b523bab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:25:25 +00:00
Lokesh Kumar Goel
65ecd098cc Update felix SVN to 25 am: f538f8e771 am: f19d2a7074
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: I24dcf2cabb55c5f2efe9dbab0750214d36928ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 23:42:09 +00:00
Lokesh Kumar Goel
7d8a0dd069 Update felix SVN to 25 am: f538f8e771 am: c2ee41a877
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: Id95ab2f3543e4df668409309027a39df41b8d26b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 23:41:19 +00:00
Lokesh Kumar Goel
693365379d Update felix SVN to 25 am: f538f8e771 am: f19d2a7074
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: Ifb286c2e3b59a2d2ecbf5bf7cc1495c1be8d995c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 23:41:01 +00:00
Lokesh Kumar Goel
c2ee41a877 Update felix SVN to 25 am: f538f8e771
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: I73ce1d8dd4bc99d5dbb1022b941a4b09e492a197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:56:27 +00:00