Commit graph

2961 commits

Author SHA1 Message Date
sukiliu
0c5c6b803b Update SELinux error
Test: scanBugreport
Bug: 270633115
Change-Id: I7ef3ae4b7a6f571a6159015a37406101a7e4e7f3
2023-02-24 09:59:12 +08: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
leochuang
bb408dc994 Update SELinux error am: 016905f2da am: 2569d0db8a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/21533844

Change-Id: I136582b88174d7b550b3718df1287282ca0f1dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 12:51:50 +00:00
leochuang
cafadee81f Update SELinux error am: 016905f2da
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/21533844

Change-Id: I08c97534e7bc2a1224f116c4377477147960d7a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 11:42:28 +00:00
leochuang
2569d0db8a Update SELinux error am: 016905f2da
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/21533844

Change-Id: I37be75f6c55668f9510ef04d67debfa625ba0417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 11:42:02 +00:00
Android Build Coastguard Worker
8ab2e01593 Snap for 9635132 from 81477881a7 to udc-release
Change-Id: Ie1941b972c6980bc48ed0aacc48456ca1e9994ff
2023-02-22 04:02:11 +00:00
leochuang
016905f2da Update SELinux error
Test: scanBugreport
Bug: 270247129
Bug: 270247072
Change-Id: I9405da7b1aa9d10e71872e92e9e35f64bfc44cb3
2023-02-22 10:29:07 +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
Android Build Coastguard Worker
43a0805970 Snap for 9631680 from 180bc981d4 to udc-release
Change-Id: Icad0fd0ddb3fe7471c5b354d5168f6be0fc38d11
2023-02-21 02:02:09 +00:00
leochuang
c92ecfbf1b Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 270080469
Change-Id: Iae618c0bda9e787db8db5f64cd2d2d5ffc86c0d8
2023-02-21 08:49:05 +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
Tai Kuo
6680157390 [automerger skipped] Revert "[DO NOT MERGE] device/sepolicy: Add sepolicy for vibrator hal" am: bfd77dc818 am: 9e753c24c5 -s ours am: 91e625baf7 -s ours am: 7840cee1c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I524a0fe6f889512b5572dcf5dfdba8ddf51a7698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 08:56:42 +00:00
Tai Kuo
7840cee1c7 [automerger skipped] Revert "[DO NOT MERGE] device/sepolicy: Add sepolicy for vibrator hal" am: bfd77dc818 am: 9e753c24c5 -s ours am: 91e625baf7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib14db198d45ffccfcb27a0a7d3d90cb9dddf6664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 07:48:45 +00:00
Tai Kuo
5a356ad515 [automerger skipped] Revert "[DO NOT MERGE] device/sepolicy: Add sepolicy for vibrator hal" am: bfd77dc818 am: 9e753c24c5 -s ours am: 91e625baf7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02454200afa246f5912f583c5186c9a259bc7726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 07:46:26 +00:00
Tai Kuo
91e625baf7 [automerger skipped] Revert "[DO NOT MERGE] device/sepolicy: Add sepolicy for vibrator hal" am: bfd77dc818 am: 9e753c24c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I398793a32b2948e1bbaffff0a4b29e771b5557ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 06:23:36 +00:00
Tai Kuo
5a2eeffed0 [automerger skipped] Revert "[DO NOT MERGE] device/sepolicy: Add sepolicy for vibrator hal" am: bfd77dc818 am: 9e753c24c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I352963fd9e46e4b85f9192fdf83987bd8c105592
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 04:26:10 +00:00
Tai Kuo
9e753c24c5 Revert "[DO NOT MERGE] device/sepolicy: Add sepolicy for vibrator hal" am: bfd77dc818
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/21454978

Change-Id: I444ac3873b88e59eac0e93e2996bac8c0f12e56e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 02:30:27 +00:00
Android Build Coastguard Worker
84e30fa5bd Snap for 9617930 from b2e4454be6 to udc-release
Change-Id: I4766680a4e8b3396336afc577409ed013d395011
2023-02-17 02:06:47 +00:00
Tai Kuo
bfd77dc818 Revert "[DO NOT MERGE] device/sepolicy: Add sepolicy for vibrator hal"
This reverts commit 5e8ab96efb.

Bug: 198239103
Test: build pass on git_tm-qpr-dev-plus-aosp
Test: build pass on git_stage-aosp-master
Change-Id: I64fa53bef8a88b219ddb154dc919a1313f4e9db7
2023-02-16 15:51:16 +00:00
Android Build Coastguard Worker
6ee617add3 Snap for 9613524 from abe44d389c to udc-release
Change-Id: Iffbc9168a842a97c04ffe35d6543674839a18a6f
2023-02-16 02:02:23 +00: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
Android Build Coastguard Worker
ebff4d1121 Snap for 9607154 from ba71a8b293 to udc-release
Change-Id: Ia71b3267e192710330db32f304e3aba4f0ce4c46
2023-02-15 02:02:32 +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
Android Build Coastguard Worker
c3d2cb7df7 Snap for 9606726 from 6bc2c61fef to tm-qpr3-release
Change-Id: I940136d016066bdc0f763a264fdda9c73e8d429c
2023-02-15 00:01:45 +00: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