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
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
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
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
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
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
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
677fd9e8ac
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: I53d2bc336dd59544bf179a45ba8bc3711568e94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:09:56 +00:00
Treehugger Robot
4de7df1c5e
Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev
2023-08-21 21:20:40 +00:00
Nathan Kulczak
f200427cf5
Merge "felix/vibrator: Disable PWLE by default" into main
2023-08-17 15:52:09 +00:00
Lokesh Kumar Goel
458e9d265c
Update felix SVN to 25 am: f538f8e771
am: f19d2a7074
am: 65ecd098cc
am: 310a98d2d0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880
Change-Id: I85cc7f864844282ccdd8aa1e05fd94bd21f0cf0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:35:02 +00:00
Lokesh Kumar Goel
92afd32f7d
Update felix SVN to 25 am: f538f8e771
am: c2ee41a877
am: 7d8a0dd069
am: 1c5e4e292b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880
Change-Id: Ic7f13fe6ecb873b94cd1c93ce07bf4be7d83f836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:31:03 +00:00
Lokesh Kumar Goel
f159a170ae
Update felix SVN to 25 am: f538f8e771
am: f19d2a7074
am: 693365379d
am: 80fd6888fc
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880
Change-Id: I6b4a10e258390b5024339f34f6ea312d154236d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:13:51 +00:00
Nathan Kulczak
74a0f2b801
felix/vibrator: Disable PWLE by default
...
Set chirp.enabled prop to 0 by default so that it will not cause tests
to fail.
Change prop to persist from ro so that it can be enabled for testing.
Update Felix HAL to use new prop.
Bug: 286921585
Test: Tried using idlcli composePwle before/after setting prop
Change-Id: Ibca473aef62b7cc8e84689ddba83a91daddb8d2e
Signed-off-by: Nathan Kulczak <nathankulczak@google.com>
2023-08-17 00:34:36 +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