Commit graph

3352 commits

Author SHA1 Message Date
Xin Li
1c4121820c [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours am: b7cf79b50d -s ours am: 721d839d2a -s ours am: e4a3248e2d -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: I048381b355a799c393d547af4e917a9405f4617f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:38:14 +00:00
Florian Mayer
880a4129d0 Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db am: 9c8f7cff7b am: 4165369e1c am: c94c63a579
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: I39a81cedb191abe16c3a93eac2a16dbd88cdd6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:02:54 +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
Android Build Coastguard Worker
45c60eee66 Snap for 10726380 from 96c377d870 to udc-qpr1-release
Change-Id: I98a73468f2c8e7b735eed68a1fb49d68fe0dd6b5
2023-08-28 23:02:13 +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
ba7991ce63 [AIDL] Add mixer paths for BT am: 96c377d870 am: 5e690c0a4c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24548399

Change-Id: I55368655d4a12dd95ba6fbfa4714071dafed670f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 19:17:40 +00: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
Android Build Coastguard Worker
db6dd2de7e Snap for 10712072 from 7dd2e35ae5 to udc-qpr1-release
Change-Id: I0b51c54ee8d71a13d49550df95436316f81c8048
2023-08-24 23:02:00 +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
6619708767 Merge "[USB Audio AIDL] Add mixer_paths for usb audio." into udc-qpr-dev am: 7dd2e35ae5 am: 859e412e25
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24457669

Change-Id: Ib0f215e9f82a194d379796a412c848fc82c7f3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 06:59:19 +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
Android Build Coastguard Worker
3452e1c46c [coastguard skipped] Merge sparse cherrypicks from sparse-10705648-L70200000962736881 into udc-release.
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
COASTGUARD_SKIP: Ibe8f592fbf8506c33b06cc47b0dd8d5489d68633

Change-Id: Idae0eec8299c1b6d47fc444c18e7cf1284353826
2023-08-23 23:46:15 +00:00
Android Build Coastguard Worker
c5c08f04f3 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10705648-L70200000962736881.
SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476

Change-Id: Ibe8f592fbf8506c33b06cc47b0dd8d5489d68633
2023-08-23 23:40:38 +00:00
Lokesh Kumar Goel
9d2c9c3ee4 Update felix SVN to 25
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f538f8e771f5f8d8866c49dddbf82254d8e39f85)
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
2023-08-23 23:39:01 +00:00
Android Build Coastguard Worker
80f8999fbb Snap for 10704513 from 7a82185421 to udc-qpr1-release
Change-Id: I1f9850a3f97a87a2df3433bbb1ee6cec4d1ce960
2023-08-23 23:02:58 +00:00
Cheng Chang
21105d1827 Merge "update the gps conf to the latest version" into udc-qpr-dev am: 7a82185421 am: e57fe1ee92
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24398895

Change-Id: I994764316b86bddb8cba2e249c6d53fc6e8655fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 19:14:55 +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
Android Build Coastguard Worker
43f2cf5701 Snap for 10697761 from 4dc0462849 to udc-qpr1-release
Change-Id: I3e8bf24d4ed041d50b7e29b5378abe5440fe52a6
2023-08-22 23:02:01 +00:00
Android Build Coastguard Worker
cd7794f22d [coastguard skipped] Merge sparse cherrypicks from sparse-10696112-L14300000962710292 into udc-release.
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
COASTGUARD_SKIP: I6a31237bc964df3390b1dca40062ca4d2e54d516

Change-Id: Ie2c6dfe7bc7b2024fef5d2375d24ac55411a4bf9
2023-08-22 21:17:48 +00:00
Android Build Coastguard Worker
7a1982acb3 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10696112-L14300000962710292.
SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476

Change-Id: I6a31237bc964df3390b1dca40062ca4d2e54d516
2023-08-22 21:11:18 +00:00
Lokesh Kumar Goel
b958006515 Update felix SVN to 25
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f538f8e771f5f8d8866c49dddbf82254d8e39f85)
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
2023-08-22 21:09:27 +00:00
Jason Chang
cd7773b1cd Merge "Adjust Power button light reveal position in line with the power button for F10" into udc-qpr-dev am: 4dc0462849 am: 9077cf541a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24439411

Change-Id: If29fb15ce15fe2c96400d5c924459381baddd3af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 07:44:11 +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
Android Build Coastguard Worker
2b2445c7a7 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24374051', 'googleplex-android-review.googlesource.com/24394073', 'googleplex-android-review.googlesource.com/24426027', 'googleplex-android-review.googlesource.com/24220184'] into udc-release.
Change-Id: I0e5f7e019560f636d05121ac7b33937589965f2f
2023-08-22 02:18:45 +00:00
Edwin Tung
4214a4b7ad gps: Disable Vzw SUPL OTDOA
Bug: 293213801

Test: OTDOA disabled
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c9015ef36bd0eaf35179f6d726e13e48dd7974bb)
Merged-In: I402e5c6e0cb54eb0596cf846483b63d356992b65
Change-Id: I402e5c6e0cb54eb0596cf846483b63d356992b65
2023-08-22 02:07:32 +00:00
Lokesh Kumar Goel
ce96371fc2 Update felix SVN to 24
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0368e3e8219b7187bc7acf08d4d6b9063ddd2b48)
Merged-In: I64164674d19b1e7d49094fed2175ec7c63f9ad82
Change-Id: I64164674d19b1e7d49094fed2175ec7c63f9ad82
2023-08-22 02:07:25 +00:00
Bassem Khalife
c506f0cddd Update felix SVN to 23
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ecf2187a2dc4a314562289ed2528d787eb28e74)
Merged-In: I3f4936d26b869ca400be05386fc009d95cf003c2
Change-Id: I3f4936d26b869ca400be05386fc009d95cf003c2
2023-08-22 02:07:16 +00:00
Bassem Khalife
755154d6d4 Update felix SVN to 22
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d)
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-22 02:07:06 +00:00
Treehugger Robot
318e6be412 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 99e0b6fff8 am: dde3e911f2 am: 1de1296e9d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: Ia1e7549e4bb9299834f9874e566cf668c4084348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 01:10:23 +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
096004f952 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 99e0b6fff8 am: 47daeaeef9 am: 9d99bdabcb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

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

Change-Id: Ic4aafabf4b284bd32f2b56c45fb809c588d96834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 00:01:41 +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
ece86aa062 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 677fd9e8ac
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: If43711e2ef1a2d801f17671b06145762b755642b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:25:24 +00:00