Commit graph

1943 commits

Author SHA1 Message Date
TreeHugger Robot
47b1f96d88 Merge "haptics: update hapitcs sink and slot setting" into udc-dev am: 9d0d844efc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21536456

Change-Id: I1f9d9a9140402e1f1a8881a72a2491fbb3aa8af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:08:02 +00:00
TreeHugger Robot
9d0d844efc Merge "haptics: update hapitcs sink and slot setting" into udc-dev 2023-02-28 14:31:44 +00:00
Android Build Coastguard Worker
0ca34ac08e [coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L75600000958834478 into tm-qpr2-release.
COASTGUARD_SKIP: Ib247b59ed6636413b840ae9f4baa582fd2492d3e
COASTGUARD_SKIP: I2ade29622e6c01ade96a7b15609131635c7ac502

Change-Id: I78d9a704c4cc011957a5089bcadfe3a9a25549a2
2023-02-28 00:30:53 +00:00
Android Build Coastguard Worker
3ff50400c8 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21582142'] into sparse-9662652-L75600000958834478.
SPARSE_CHANGE: I2ade29622e6c01ade96a7b15609131635c7ac502

Change-Id: Ib247b59ed6636413b840ae9f4baa582fd2492d3e
2023-02-28 00:21:35 +00:00
Steve Berbary
5e0733462d Update bluejay SVN to 29
Bug: 268558932
Change-Id: I2ade29622e6c01ade96a7b15609131635c7ac502
(cherry picked from commit b50a7c52a7)
Merged-In: I2ade29622e6c01ade96a7b15609131635c7ac502
2023-02-28 00:18:57 +00:00
Android Build Coastguard Worker
2b5dc80ea5 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21412246'] into tm-qpr2-release.
Change-Id: I6ed2641237a06cf582b53d8225edd424f46f5872
2023-02-27 23:28:26 +00:00
Steve Berbary
6ad70b9317 Update bluejay SVN to 28
Bug: 268558932
Change-Id: I62120770b8dcef9d16143ffcc31ef563f5a3569f
(cherry picked from commit dcfa25455e)
Merged-In: I62120770b8dcef9d16143ffcc31ef563f5a3569f
2023-02-27 23:26:28 +00:00
Steve Berbary
17b1d819b0 Update bluejay SVN to 29 am: b50a7c52a7 am: 1129c16714 am: 3b4fcfec8c am: 84ef86d8da
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21582142

Change-Id: Ica04b9fc7d2e2835ae1f2a35f15a1e134458b4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 01:44:24 +00:00
Steve Berbary
4a96b937e7 Update bluejay SVN to 29 am: b50a7c52a7 am: 1129c16714 am: 3b4fcfec8c am: 9c0c923ef0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21582142

Change-Id: I463c83082084ddebace60a5929777bcd7b1c8987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 01:43:03 +00:00
Steve Berbary
84ef86d8da Update bluejay SVN to 29 am: b50a7c52a7 am: 1129c16714 am: 3b4fcfec8c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21582142

Change-Id: I48430f9f973f2697a30a277bcbf2de6b7b76308f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 00:58:19 +00:00
Steve Berbary
9c0c923ef0 Update bluejay SVN to 29 am: b50a7c52a7 am: 1129c16714 am: 3b4fcfec8c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21582142

Change-Id: I8dbf3e006978c71e04d4ec3aa1b0097f225a9643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 00:58:03 +00:00
Steve Berbary
3b4fcfec8c Update bluejay SVN to 29 am: b50a7c52a7 am: 1129c16714
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21582142

Change-Id: I51b6c0a8c4a5a40db8c77f06be92ed06ff124379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 23:49:28 +00:00
Steve Berbary
1129c16714 Update bluejay SVN to 29 am: b50a7c52a7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21582142

Change-Id: I5d16b8e48619d872f5b6cd589e72b72ad4fa4c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 22:52:55 +00:00
Steve Berbary
b50a7c52a7 Update bluejay SVN to 29
Bug: 268558932
Change-Id: I2ade29622e6c01ade96a7b15609131635c7ac502
2023-02-24 20:56:14 +00:00
Android Build Coastguard Worker
bbe78cb625 [coastguard skipped] Merge sparse cherrypicks from sparse-9595452-L85600000958806578 into tm-qpr2-release.
COASTGUARD_SKIP: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
COASTGUARD_SKIP: I802b49fe914db67a2c45848fdf341aed189c4c6e
COASTGUARD_SKIP: Ib470797ee55db8b15e00c3f3b03742d705201e84

Change-Id: Ia38b41aa5c8430ec48805759de6fcc9cfdbd8543
2023-02-24 19:26:37 +00:00
Android Build Coastguard Worker
81946f4ca6 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21359647', 'googleplex-android-review.googlesource.com/21403281'] into sparse-9595452-L85600000958806578.
SPARSE_CHANGE: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
SPARSE_CHANGE: Ib470797ee55db8b15e00c3f3b03742d705201e84

Change-Id: I802b49fe914db67a2c45848fdf341aed189c4c6e
2023-02-24 19:20:31 +00:00
Steve Berbary
eb9433b15c Update bluejay SVN to 27
Bug: 268558932
Change-Id: Ib470797ee55db8b15e00c3f3b03742d705201e84
(cherry picked from commit aec8100db6)
Merged-In: Ib470797ee55db8b15e00c3f3b03742d705201e84
2023-02-24 19:19:47 +00:00
Steve Berbary
4aa39e5f89 Update bluejay SVN to 26
Bug: 268558932
Change-Id: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
(cherry picked from commit d0ff062816)
Merged-In: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
2023-02-24 19:19:37 +00:00
Jeffrey Carlyle
72122a572e dck: add SE capability property
Bug: 229777047
Test: boot cheetah; check logs to see that SE property is used
Change-Id: I413b80530f585317ec272383c9027c7725c8ea77
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
2023-02-22 14:51:21 -08:00
Tai Kuo
830adc99d1 haptics: update hapitcs sink and slot setting
Bug: 270023634
Test: trigger audio coupled haptics via sound picker app
Change-Id: I56368f7a6a5097825ea89dfba3880cae1b92f1e7
2023-02-22 21:50:33 +08:00
KRIS CHEN
bcf25ac70e Merge "Remove the redundant g7 ta loading in init.xxx.rc" into udc-dev am: 81477881a7 am: 7963f5bc6a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21517330

Change-Id: Ic54371dec46915107d7582d4987da1262841df47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 12:04:07 +00:00
KRIS CHEN
7963f5bc6a Merge "Remove the redundant g7 ta loading in init.xxx.rc" into udc-dev am: 81477881a7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21517330

Change-Id: I460eecced90fe9d2322b14ed9188f545179dc329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 10:53:59 +00:00
KRIS CHEN
76144352f6 Merge "Remove the redundant g7 ta loading in init.xxx.rc" into udc-dev am: 81477881a7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21517330

Change-Id: I4dc0998f183809676af077dc8953873522ea7eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 10:51:42 +00:00
KRIS CHEN
81477881a7 Merge "Remove the redundant g7 ta loading in init.xxx.rc" into udc-dev 2023-02-21 09:11:04 +00:00
Kris Chen
c1296ab940 Remove the redundant g7 ta loading in init.xxx.rc
Bug: 264646112
Test: fingerprint works fine after device reboot
Change-Id: Ib0e0d55625d6376289d42ef96bbf067ed17715b9
2023-02-21 15:37:47 +08:00
Tai Kuo
b3c9cbe8a6 [automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 588ebb3a8f -s ours am: 085828fa09 -s ours am: 180bc981d4 -s ours am: 18c894bf8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23ffe966a89febda94c109eaa71b2317cf184a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 14:10:13 +00:00
Tai Kuo
18c894bf8d [automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 588ebb3a8f -s ours am: 085828fa09 -s ours am: 180bc981d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3fb9dc6715dba4db979891181e019fe5f42be29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 13:02:05 +00:00
Tai Kuo
fb25e9539d [automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 588ebb3a8f -s ours am: 085828fa09 -s ours am: 180bc981d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I873af92c245914070d84a3082d71c989a966ddef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 12:59:14 +00:00
Tai Kuo
46846c1cee [automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 37cc2e1944 -s ours am: 540f87d8e8 -s ours am: 86cdf4161f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie255890a72979a1a75fbdb1fcd881027787367b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 11:41:14 +00:00
Tai Kuo
180bc981d4 [automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 588ebb3a8f -s ours am: 085828fa09 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0f6f6281eb047406bbc7fc6c96240c08d0b89fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 11:30:51 +00:00
Tai Kuo
86cdf4161f [automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 37cc2e1944 -s ours am: 540f87d8e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae54baf3014183eea662f08407ad137a0852d7e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 10:32:15 +00:00
Tai Kuo
f64e31b2b5 [automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 37cc2e1944 -s ours am: 540f87d8e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9105af096c8d7c1db7484a70501863d172bb4b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 10:31:02 +00:00
Tai Kuo
085828fa09 [automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 588ebb3a8f -s ours
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 37cc2e1944 is already in history

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

Change-Id: I4e12499ae2acc6439bc261843591d91cfc5edf9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 10:20:32 +00:00
Tai Kuo
540f87d8e8 [automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 37cc2e1944 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a62105877716fd9579ade41c88c89dbc7cc9dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 09:02:35 +00:00
Tai Kuo
588ebb3a8f [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL
Use common vibrator hal in hardware/google/pixel instead of
device/google/bluejay.  This will use the common vibrator hal from now
on to support the adaptive haptics feature.

Bug: 198239103
Bug: 269762222
Test: Verified on device
Merged-In: Ic83c61df6297696c06e63a23241b308f92ac70bd
Change-Id: Ic83c61df6297696c06e63a23241b308f92ac70bd
2023-02-20 13:42:12 +08:00
Tai Kuo
37cc2e1944 [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL
Use common vibrator hal in hardware/google/pixel instead of
device/google/bluejay.  This will use the common vibrator hal from now
on to support the adaptive haptics feature.

Bug: 198239103
Bug: 269762222
Test: Verified on device
Change-Id: Ic83c61df6297696c06e63a23241b308f92ac70bd
2023-02-20 13:41:42 +08:00
Xin Li
b2e4454be6 [automerger skipped] Merge TQ2A.230305.008 am: 3b882cdef8 -s ours am: 1d0128ca3c -s ours
am skip reason: Merged-In If127a2710c6a3c685987bbc4a1c1b6e619ff781c with SHA-1 17f995666a is already in history

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

Change-Id: Ia6d024074b62989f0010eb61070b57cb7ed29ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 22:51:03 +00:00
Xin Li
1d0128ca3c [automerger skipped] Merge TQ2A.230305.008 am: 3b882cdef8 -s ours
am skip reason: Merged-In If127a2710c6a3c685987bbc4a1c1b6e619ff781c with SHA-1 17f995666a is already in history

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

Change-Id: Iba3dbc89ccc45e3ba2c8c62bc014cd3d37d637b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 22:04:49 +00:00
Xin Li
3b882cdef8 Merge TQ2A.230305.008
Bug: 264720040
Merged-In: If127a2710c6a3c685987bbc4a1c1b6e619ff781c
Change-Id: I79161118909a60ad537e7670fb02c18595cb6551
2023-02-14 16:11:01 -08:00
Chris Paulo
abe44d389c [automerger skipped] Merge "[DO NOT MERGE] bluejay/vibrator: Re-enable adaptive haptics" into tm-qpr-dev am: 6bc2c61fef am: a0ddf2243d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e97d900f49a1319becea1e7805d529da4890ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 23:36:11 +00:00
Chris Paulo
fbd8923cb3 [automerger skipped] [DO NOT MERGE] bluejay/vibrator: Re-enable adaptive haptics am: 8fcd6b1758 am: 2a6aa79713 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide40651bb4a9f6e33eaae459fcd9cdd2d1e99440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 23:36:08 +00:00
Chris Paulo
a0ddf2243d Merge "[DO NOT MERGE] bluejay/vibrator: Re-enable adaptive haptics" into tm-qpr-dev am: 6bc2c61fef
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21107464

Change-Id: I92ccddb402515a4d8cb8e0107dae931ffee922b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 22:44:48 +00:00
Chris Paulo
2a6aa79713 [DO NOT MERGE] bluejay/vibrator: Re-enable adaptive haptics am: 8fcd6b1758
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21107464

Change-Id: If103321c8f2ca7a67efe73954953a1a2376a6874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 22:44:46 +00:00
Chris Paulo
6bc2c61fef Merge "[DO NOT MERGE] bluejay/vibrator: Re-enable adaptive haptics" into tm-qpr-dev 2023-02-14 21:43:26 +00:00
Android Build Coastguard Worker
a36ee1a07f [coastguard skipped] Merge sparse cherrypicks from sparse-9605534-L22400000958611218 into tm-qpr2-release.
COASTGUARD_SKIP: Id3ac9f062b3610c32d3905e724589659ff54e097
COASTGUARD_SKIP: I62120770b8dcef9d16143ffcc31ef563f5a3569f

Change-Id: I3d8b33b2cd291818740e1dbece4f2f7ffbd4517f
2023-02-14 18:59:01 +00:00
Android Build Coastguard Worker
2e899bab91 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21412246'] into sparse-9605534-L22400000958611218.
SPARSE_CHANGE: I62120770b8dcef9d16143ffcc31ef563f5a3569f

Change-Id: Id3ac9f062b3610c32d3905e724589659ff54e097
2023-02-14 18:52:00 +00:00
Steve Berbary
ffca3ae936 Update bluejay SVN to 28
Bug: 268558932
Change-Id: I62120770b8dcef9d16143ffcc31ef563f5a3569f
(cherry picked from commit dcfa25455e)
Merged-In: I62120770b8dcef9d16143ffcc31ef563f5a3569f
2023-02-14 18:50:13 +00:00
Android Build Coastguard Worker
135708c72b Merge cherrypicks of ['googleplex-android-review.googlesource.com/21359647', 'googleplex-android-review.googlesource.com/21403281'] into tm-qpr2-release.
Change-Id: Ic532a389d26de836f66c8e52aafdfbdd4e94d9e6
2023-02-14 18:20:07 +00:00
Steve Berbary
c8acaa709f Update bluejay SVN to 27
Bug: 268558932
Change-Id: Ib470797ee55db8b15e00c3f3b03742d705201e84
(cherry picked from commit aec8100db6)
Merged-In: Ib470797ee55db8b15e00c3f3b03742d705201e84
2023-02-14 18:13:11 +00:00
Steve Berbary
d2b240fe94 Update bluejay SVN to 26
Bug: 268558932
Change-Id: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
(cherry picked from commit d0ff062816)
Merged-In: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
2023-02-14 18:13:06 +00:00