Xin Li
073b234c19
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours am: 3036eedd55
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: I85146f7bf13b7d03fe2de0d9ad090964277d57ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 02:03:45 +00:00
Xin Li
3036eedd55
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: If56b6c34c9d0fead86966f654ec05b6386f397c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:07:20 +00:00
Steve Berbary
d2f6a0032c
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
am: 32dc0da8fe
am: e2685bce58
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: If4a3eda23f02705762f6847dde95844fc0c0adc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:23:28 +00:00
Steve Berbary
ece20aeab8
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
am: 32dc0da8fe
am: 633a6c9355
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: I0b3aec3cf5f9672a8d2c471d16ab31804d4460e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:22:57 +00:00
Xin Li
fa51f861f0
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: Id010420fb540974fcaa66796ecff2407b127c73f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:06:18 +00:00
Steve Berbary
e2685bce58
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
am: 32dc0da8fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: If92faaa8478acd0de78a2fc404e1cd2c0664eaf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:40:46 +00:00
Steve Berbary
633a6c9355
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
am: 32dc0da8fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: I07265ecece802f1e8965c82bc6f28254b39519b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:39:30 +00:00
Xin Li
942685b157
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: Iba8c895f0cb45b4b3141bbd7c6601bdc9070f8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:12 +00:00
Steve Berbary
32dc0da8fe
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: I89754947c5227298c7a8021b5577aa21cca65270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:02:04 +00:00
Xin Li
95e5714088
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: Ie9a3fbd6589d2bc1d3fa5da7ebfb10404b8c5b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:19 +00:00
Steve Berbary
987ededda9
Update bluejay SVN to 31 am: de230640ea
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: Id2426491851902500be621b4b229fd133c49ceb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:41:38 +00:00
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
8c7f3f381d
[NFC] Add antenna position coordinates am: b8a9fbf2db
am: ff13455de0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21919752
Change-Id: I6a43ebf62fe8e720f5ce467a4aaf4dc4e5649233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 08:34:11 +00:00
George Chang
70194af914
[NFC] Add antenna position coordinates am: b8a9fbf2db
am: 295d0a762d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21919752
Change-Id: If1004aa7e77add7bf54b217808456be6d52326b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 08:33:02 +00:00
George Chang
ff13455de0
[NFC] Add antenna position coordinates am: b8a9fbf2db
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21919752
Change-Id: Ia75bc218b65349bec52625bfd1996017050326af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 07:59:59 +00: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
George Chang
b8a9fbf2db
[NFC] Add antenna position coordinates
...
Bug: 272406680
Test: manual
Change-Id: I219ebe937a57e02f0ba7d1701eb4dbe356c9d657
2023-03-09 08:49:01 +00:00
Jeff Pu
050b916b0a
Merge "Remove fingerprint virtual hal from individual" into udc-dev am: 469a54c625
am: 1bfece1ab2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21729853
Change-Id: I5f3657b51f82a32a3bb2c5e36d63efcc5aacfade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:37:22 +00:00
Jeff Pu
2ac863c7c8
Merge "Remove fingerprint virtual hal from individual" into udc-dev am: 469a54c625
am: 4133cdc7a5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21729853
Change-Id: Iaaccd248f1f183c3839797e079635c46aaaa011c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:31:22 +00:00
Jeff Pu
4133cdc7a5
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: I73d96d80e9c8a88a86ebc268a1d5e70659382cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:45:45 +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
Steve Berbary
4e3f30b83d
Update bluejay SVN to 30 am: e5ddd8edf2
am: 1907fbc957
am: 4dca43fbb3
am: e2668bf905
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21693196
Change-Id: Id51c04d42d38ad9f528d704b82124567bd0eca23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 09:35:36 +00:00
Steve Berbary
749c4f30a5
Update bluejay SVN to 30 am: e5ddd8edf2
am: 1907fbc957
am: 4dca43fbb3
am: b0cdd8fd04
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21693196
Change-Id: I88739665b195dda057de3e348a766bedf129dbea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 09:34:33 +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
e2668bf905
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: I5bae521a43313737067880ef9dfcaa390bcd87ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 09:02:28 +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
3da18b80ff
Merge "haptics: update hapitcs sink and slot setting" into udc-dev am: 9d0d844efc
am: 155d2e6ae3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21536456
Change-Id: I8e705980249d0a67a4e3c39fdcf5a4e150c82348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:04:29 +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
3523f7a6ae
Merge "haptics: update hapitcs sink and slot setting" into udc-dev am: 9d0d844efc
am: 47b1f96d88
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21536456
Change-Id: I959dd57d26e70dfd258d960c219259dddf3e2795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:45:56 +00:00
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
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
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