Commit graph

1759 commits

Author SHA1 Message Date
Steve Berbary
de230640ea Update bluejay SVN to 31
Bug: 272844037
Change-Id: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
2023-03-14 20:15:44 +00:00
Xin Li
69ed58ce78 Merge Android 13 QPR2
Bug: 273316506
Merged-In: Ic83c61df6297696c06e63a23241b308f92ac70bd
Change-Id: Ida9fbc6ddbc729103197f8f352c5251acaaeac3f
2023-03-13 23:09:07 -07:00
George Chang
295d0a762d [NFC] Add antenna position coordinates am: b8a9fbf2db
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21919752

Change-Id: Ib5c3c00fbea1e96526764b0c44ecbe9a130fdc3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 07:59:59 +00:00
Android Build Coastguard Worker
7d90484cc9 [coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L72800000959038993 into tm-qpr2-release.
COASTGUARD_SKIP: Ic38d13d1309b15f74ab5f12913a5a8d9fdff7562
COASTGUARD_SKIP: If9eba1862e49fe31462b8f114b459c21e95d4549

Change-Id: Ieed79c97fee8aa067fd31f93f044eacb0fcf97a9
2023-03-10 00:08:06 +00:00
Android Build Coastguard Worker
830bcf1637 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196'] into sparse-9719927-L72800000959038993.
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549

Change-Id: Ic38d13d1309b15f74ab5f12913a5a8d9fdff7562
2023-03-10 00:01:39 +00:00
Steve Berbary
5b978a0691 Update bluejay SVN to 30
Bug: 268558932
Change-Id: If9eba1862e49fe31462b8f114b459c21e95d4549
(cherry picked from commit on googleplex-android-review.googlesource.com host: e5ddd8edf2)
Merged-In: If9eba1862e49fe31462b8f114b459c21e95d4549
2023-03-10 00:00:39 +00:00
Android Build Coastguard Worker
1a4dc2482b Merge cherrypicks of ['googleplex-android-review.googlesource.com/21582142'] into tm-qpr2-release.
Change-Id: I541a98c3496b32a23c87749b2267858549e0eae5
2023-03-09 19:57:49 +00:00
Steve Berbary
a6b4a589dd Update bluejay SVN to 29
Bug: 268558932
Change-Id: I2ade29622e6c01ade96a7b15609131635c7ac502
(cherry picked from commit on googleplex-android-review.googlesource.com host: b50a7c52a7)
Merged-In: I2ade29622e6c01ade96a7b15609131635c7ac502
2023-03-09 19:55:19 +00:00
George Chang
b8a9fbf2db [NFC] Add antenna position coordinates
Bug: 272406680
Test: manual
Change-Id: I219ebe937a57e02f0ba7d1701eb4dbe356c9d657
2023-03-09 08:49:01 +00:00
Android Build Coastguard Worker
aaa94567b2 [coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L34400000958984256 into tm-qpr2-release.
COASTGUARD_SKIP: I2ade29622e6c01ade96a7b15609131635c7ac502
COASTGUARD_SKIP: Ie0c9e569832b083beda2c2d46d2b3e424ed23506

Change-Id: I9e2010e340d6f579bb568abc337a1b6e0b8f26b0
2023-03-07 19:02:06 +00:00
Android Build Coastguard Worker
77ba7ef29d Merge cherrypicks of ['googleplex-android-review.googlesource.com/21582142'] into sparse-9662652-L34400000958984256.
SPARSE_CHANGE: I2ade29622e6c01ade96a7b15609131635c7ac502

Change-Id: Ie0c9e569832b083beda2c2d46d2b3e424ed23506
2023-03-07 18:54:46 +00:00
Steve Berbary
869c5f7120 Update bluejay SVN to 29
Bug: 268558932
Change-Id: I2ade29622e6c01ade96a7b15609131635c7ac502
(cherry picked from commit on googleplex-android-review.googlesource.com host: b50a7c52a7)
Merged-In: I2ade29622e6c01ade96a7b15609131635c7ac502
2023-03-07 18:53:27 +00:00
Chris Paulo
d4b713a196 device/bluejay: Add adaptive haptics props
Add default adaptive haptics props for bluejay.

Bug: 198239103
Test: Verified functionality
Change-Id: I43a0dc0a84d682d8f71ae4ebac14cc123bd60ec4
Signed-off-by: Chris Paulo <chrispaulo@google.com>
2023-03-06 20:57:48 +00:00
Jeff Pu
1bfece1ab2 Merge "Remove fingerprint virtual hal from individual" into udc-dev am: 469a54c625
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21729853

Change-Id: Ib9fc0733418cccfefe7eac77116763b616a32ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:42:47 +00:00
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
Android Build Coastguard Worker
eb97c7f766 [coastguard skipped] Merge sparse cherrypicks from sparse-9595452-L67700000958895381 into tm-qpr2-release.
COASTGUARD_SKIP: I62120770b8dcef9d16143ffcc31ef563f5a3569f
COASTGUARD_SKIP: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
COASTGUARD_SKIP: Ib470797ee55db8b15e00c3f3b03742d705201e84
COASTGUARD_SKIP: Ifd357b969a13c88c02c668206ee605d075fe3127

Change-Id: Ia89afd4bca3c3b5c1a72d5d48417c70595c5fe17
2023-03-02 18:23:51 +00:00
Android Build Coastguard Worker
715c0d2cf4 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21359647', 'googleplex-android-review.googlesource.com/21403281', 'googleplex-android-review.googlesource.com/21412246'] into sparse-9595452-L67700000958895381.
SPARSE_CHANGE: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
SPARSE_CHANGE: Ib470797ee55db8b15e00c3f3b03742d705201e84
SPARSE_CHANGE: I62120770b8dcef9d16143ffcc31ef563f5a3569f

Change-Id: Ifd357b969a13c88c02c668206ee605d075fe3127
2023-03-02 18:15:59 +00:00
Steve Berbary
a7e0c07305 Update bluejay SVN to 28
Bug: 268558932
Change-Id: I62120770b8dcef9d16143ffcc31ef563f5a3569f
(cherry picked from commit dcfa25455e)
Merged-In: I62120770b8dcef9d16143ffcc31ef563f5a3569f
2023-03-02 18:15:03 +00:00
Steve Berbary
f4c9d69ccb Update bluejay SVN to 27
Bug: 268558932
Change-Id: Ib470797ee55db8b15e00c3f3b03742d705201e84
(cherry picked from commit aec8100db6)
Merged-In: Ib470797ee55db8b15e00c3f3b03742d705201e84
2023-03-02 18:14:57 +00:00
Steve Berbary
168e6dd300 Update bluejay SVN to 26
Bug: 268558932
Change-Id: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
(cherry picked from commit d0ff062816)
Merged-In: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
2023-03-02 18:14:50 +00:00
Steve Berbary
b0cdd8fd04 Update bluejay SVN to 30 am: e5ddd8edf2 am: 1907fbc957 am: 4dca43fbb3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21693196

Change-Id: I41f828138fdb2b505449036bf428306feb829eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 09:02:41 +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
Android Build Coastguard Worker
162e23189c [coastguard skipped] Merge sparse cherrypicks from sparse-9595452-L64000000958893796 into tm-qpr2-release.
COASTGUARD_SKIP: Ib470797ee55db8b15e00c3f3b03742d705201e84
COASTGUARD_SKIP: I4f6a89b47d226276a34173e7de6f5529581d0415
COASTGUARD_SKIP: I19380198fcb5b0b3d7bc375fd427d122b133eeb9

Change-Id: I2d2bda48a5da72f162ca97b8fbb3e8c819a80620
2023-03-02 03:56:45 +00:00
Android Build Coastguard Worker
a33e3e72f6 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21359647', 'googleplex-android-review.googlesource.com/21403281'] into sparse-9595452-L64000000958893796.
SPARSE_CHANGE: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
SPARSE_CHANGE: Ib470797ee55db8b15e00c3f3b03742d705201e84

Change-Id: I4f6a89b47d226276a34173e7de6f5529581d0415
2023-03-02 03:50:05 +00:00
Steve Berbary
8516347fd1 Update bluejay SVN to 27
Bug: 268558932
Change-Id: Ib470797ee55db8b15e00c3f3b03742d705201e84
(cherry picked from commit aec8100db6)
Merged-In: Ib470797ee55db8b15e00c3f3b03742d705201e84
2023-03-02 03:49:25 +00:00
Steve Berbary
355c42846c Update bluejay SVN to 26
Bug: 268558932
Change-Id: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
(cherry picked from commit d0ff062816)
Merged-In: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
2023-03-02 03:49:17 +00:00
TreeHugger Robot
155d2e6ae3 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: Ia9604bf4e0ff53e66fbcac4390a21aa4f298424c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:46:32 +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
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
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