Commit graph

1565 commits

Author SHA1 Message Date
Jeff Pu
469a54c625 Merge "Remove fingerprint virtual hal from individual" into udc-dev 2023-03-03 19:42:05 +00:00
Jeff Pu
4d3a27df78 Remove fingerprint virtual hal from individual
pixel device mk files since it is included in common one

Bug: 270940857
Test: manual build
Change-Id: I2a39eae0b849f35a9304e49ca7d0f83995c31871
2023-03-02 21:34:22 +00:00
Steve Berbary
4dca43fbb3 Update bluejay SVN to 30 am: e5ddd8edf2 am: 1907fbc957
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21693196

Change-Id: I3ed491cab9da9924a1f3c5c3433b422d3d53452b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 08:23:17 +00:00
Steve Berbary
1907fbc957 Update bluejay SVN to 30 am: e5ddd8edf2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21693196

Change-Id: I669fe7ab92ff4685d7f2db32c27d5769fb09e189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 07:48:04 +00:00
Steve Berbary
e5ddd8edf2 Update bluejay SVN to 30
Bug: 268558932
Change-Id: If9eba1862e49fe31462b8f114b459c21e95d4549
2023-03-02 05:10:01 +00:00
TreeHugger Robot
9d0d844efc Merge "haptics: update hapitcs sink and slot setting" into udc-dev 2023-02-28 14:31:44 +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
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
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
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
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
Steve Berbary
ba71a8b293 Update bluejay SVN to 28 am: dcfa25455e am: 7ae1d6dac5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21412246

Change-Id: Ia6a118fcb6b22b8df4916e7639f7a2038e12f73f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 04:34:30 +00:00
Steve Berbary
7ae1d6dac5 Update bluejay SVN to 28 am: dcfa25455e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21412246

Change-Id: Ic12ba9cbd1e5bfe71f22207c1463b01e6006f418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 03:44:35 +00:00
Steve Berbary
dcfa25455e Update bluejay SVN to 28
Bug: 268558932
Change-Id: I62120770b8dcef9d16143ffcc31ef563f5a3569f
2023-02-14 01:51:14 +00:00
Steve Berbary
470d3e9025 Update bluejay SVN to 27 am: aec8100db6 am: dbf096b032
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21403281

Change-Id: Ief583faab631b8103e094918ebbd0a175ca8b9e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 00:57:04 +00:00
Steve Berbary
dbf096b032 Update bluejay SVN to 27 am: aec8100db6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21403281

Change-Id: Ic110700a2497e6f980855514c2831ab7f5ec2adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 00:04:47 +00:00
Steve Berbary
aec8100db6 Update bluejay SVN to 27
Bug: 268558932
Change-Id: Ib470797ee55db8b15e00c3f3b03742d705201e84
2023-02-13 21:20:44 +00:00
Chris Paulo
8fcd6b1758 [DO NOT MERGE] bluejay/vibrator: Re-enable adaptive haptics
Re-enable the adaptive haptics feature for latest qpr in order to align
with other similar devices.

Bug: 198239103
Test: adb shell dumpsys android.hardware.vibrator.IVibrator/default
Change-Id: Ie2964f4971f209ad4d18a05007e1847bad68ff25
Signed-off-by: Chris Paulo <chrispaulo@google.com>
2023-02-11 00:19:40 +00:00
Steve Berbary
d5eb9512b8 Update bluejay SVN to 26 am: d0ff062816 am: b6cfbd18b7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21359647

Change-Id: Ib38bbb36385a45faa6c74dfb7f6f439ff872cbd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 06:49:49 +00:00
Steve Berbary
b6cfbd18b7 Update bluejay SVN to 26 am: d0ff062816
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21359647

Change-Id: Icbbe842a42eb43bed965562d5e6561bf37da4149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 06:07:37 +00:00
Steve Berbary
d0ff062816 Update bluejay SVN to 26
Bug: 268558932
Change-Id: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
2023-02-10 03:12:52 +00:00
Xin Li
012b167a59 [automerger skipped] Merge TQ1A.230205.002 am: 5e0e300375 -s ours am: ad2c89864a -s ours am: dda4b85202 -s ours
am skip reason: Merged-In I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2 with SHA-1 79dd1bc1fc is already in history

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

Change-Id: I464b9d836f5d3cf2617866d0b64e1a8297396d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 19:32:02 +00:00
Xin Li
dda4b85202 [automerger skipped] Merge TQ1A.230205.002 am: 5e0e300375 -s ours am: ad2c89864a -s ours
am skip reason: Merged-In I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2 with SHA-1 79dd1bc1fc is already in history

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

Change-Id: I9fd56d9e9a3cf565f194f4a97d746e60f2e75466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 18:45:26 +00:00
Xin Li
ad2c89864a [automerger skipped] Merge TQ1A.230205.002 am: 5e0e300375 -s ours
am skip reason: Merged-In I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2 with SHA-1 79dd1bc1fc is already in history

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

Change-Id: Ia71b3c81ddd2b162c457ada7999f0c7ba2fcda0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 18:13:29 +00:00
Xin Li
5e0e300375 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2
Change-Id: I75d8b6e1c8c93acf28b0d2002923da3b6af7bbcf
2023-02-06 21:02:14 -08:00
TreeHugger Robot
9eae21b4c3 Merge "conf: setup vibrator permission and init cs40l26 HAL" 2023-02-04 05:17:05 +00:00
TreeHugger Robot
69846b8ad1 Merge "Set /dev/goodix_fp permission on early-boot" 2023-02-02 03:02:39 +00:00
George
b757a3a61e [NFC] Set tag_intent_app_pref_supported
Bug: 244272155
Test: atest android.permission.cts.NfcPermissionTest
Test: atest NfcFeatureFlagTest
Change-Id: Idc311bbab5427dad5290162cc1f100716cb011e0
2023-02-01 18:06:07 +08:00
Kris Chen
f8b6eb461e Set /dev/goodix_fp permission on early-boot
Bug: 264497933
Test: Passed PtsFingerprintTest#udfpsHalStateCheck.
Change-Id: I4bc8b592b205a37d89d1cbe2a6cc7b918c028c1a
2023-02-01 16:33:52 +08:00
Midas Chien
0527c66b8a Merge "Display: disable idle timer" 2023-01-31 14:04:08 +00:00
Tai Kuo
05b00d10bf conf: setup vibrator permission and init cs40l26 HAL
Move from hardware/google/pixel/vibrator/cs40l26/

Bug: 264625320
Test: HAL init properly.
Change-Id: I0f39e6213d92db0f402b85aade488a34bf736f0e
2023-01-18 16:36:44 +08:00
Midas Chien
d7e2862d31 Display: disable idle timer
No need to enable idle timer for project only support one refresh rate.

Bug: 264952266
Test: sf idle doesnʼt enable
Change-Id: I4a692cc60965922ed13f18b6579172a1e5878aae
2023-01-18 03:37:25 +00:00
TreeHugger Robot
2a8dca0862 Merge "thermal: more aggressive CPU throttling policy" 2023-01-18 00:14:00 +00:00
Android Build Coastguard Worker
33962f6589 Merge cherrypicks of ['ag/20984588'] into tm-qpr2-release.
Change-Id: I9e449f8ebccbe6e372e46a238f581cd9c2d599f6
2023-01-17 20:19:18 +00:00
Steve Berbary
a6412bbb2a Update bluejay SVN to 25
Bug: 265319238
Change-Id: If127a2710c6a3c685987bbc4a1c1b6e619ff781c
(cherry picked from commit 17f995666a)
Merged-In: If127a2710c6a3c685987bbc4a1c1b6e619ff781c
2023-01-17 20:05:14 +00:00
TreeHugger Robot
c1f5b87b8a Merge "Load vh_sched kernel module in parallel" 2023-01-17 14:16:21 +00:00