Xin Li
48c153486f
[automerger skipped] Merge Android 13 QPR2 am: 0d7095c52c
-s ours am: f922de41ff
-s ours am: 80bd5af495
-s ours am: 5db62bd849
-s ours am: 85e3b846ae
-s ours
...
am skip reason: Merged-In I64fa53bef8a88b219ddb154dc919a1313f4e9db7 with SHA-1 bfd77dc818
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2487020
Change-Id: I7c7759413943b9ca5f295a4fb785d470eb44db57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 02:03:58 +00:00
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
cf50f1cde6
[automerger skipped] Merge Android 13 QPR2 am: 0d7095c52c
-s ours am: f922de41ff
-s ours am: 80bd5af495
-s ours am: 5db62bd849
-s ours
...
am skip reason: Merged-In I64fa53bef8a88b219ddb154dc919a1313f4e9db7 with SHA-1 bfd77dc818
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2487020
Change-Id: I8469511036845b1819b5fea526ea5bc884219dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:10:58 +00:00
Xin Li
411e3fd108
[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: I0fe271e37c4a6d59f5a97eeee7f5ac29779b7b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:10:48 +00:00
Xin Li
85e3b846ae
[automerger skipped] Merge Android 13 QPR2 am: 0d7095c52c
-s ours am: f922de41ff
-s ours am: 80bd5af495
-s ours am: 5db62bd849
-s ours
...
am skip reason: Merged-In I64fa53bef8a88b219ddb154dc919a1313f4e9db7 with SHA-1 bfd77dc818
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2487020
Change-Id: I14f063191d1c06914750eb9331469a18e1947026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:07:37 +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
5db62bd849
[automerger skipped] Merge Android 13 QPR2 am: 0d7095c52c
-s ours am: f922de41ff
-s ours am: 80bd5af495
-s ours
...
am skip reason: Merged-In I64fa53bef8a88b219ddb154dc919a1313f4e9db7 with SHA-1 bfd77dc818
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2487020
Change-Id: I69edb0626a47f3145d809397cfbc8b1b5bb90809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:06:29 +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
80bd5af495
[automerger skipped] Merge Android 13 QPR2 am: 0d7095c52c
-s ours am: f922de41ff
-s ours
...
am skip reason: Merged-In I64fa53bef8a88b219ddb154dc919a1313f4e9db7 with SHA-1 bfd77dc818
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2487020
Change-Id: I1223c0b86d214d1424f07330f25a43d565409fb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:24 +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
f922de41ff
[automerger skipped] Merge Android 13 QPR2 am: 0d7095c52c
-s ours
...
am skip reason: Merged-In I64fa53bef8a88b219ddb154dc919a1313f4e9db7 with SHA-1 bfd77dc818
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2487020
Change-Id: I11f2e8fa1503c745fd13e694b84ee7341ca31b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:37 +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
0d7095c52c
Merge Android 13 QPR2
...
Bug: 273316506
Merged-In: I64fa53bef8a88b219ddb154dc919a1313f4e9db7
Change-Id: I624327421abda5f85d2691cd4add0a482dedfa5d
2023-03-13 23:09:31 -07:00
Xin Li
69ed58ce78
Merge Android 13 QPR2
...
Bug: 273316506
Merged-In: Ic83c61df6297696c06e63a23241b308f92ac70bd
Change-Id: Ida9fbc6ddbc729103197f8f352c5251acaaeac3f
2023-03-13 23:09:07 -07:00
Woody Lin
4ca8f97dff
Revert "Update SELinux error"
...
This reverts commit db9dfd7885
.
Reason for revert: fixed by aosp/2422419
Bug: 260366497
Bug: 264600011
Change-Id: I5454fb84cde8bb7b24971388e9a09e31100f7993
2023-03-14 09:45:40 +08:00
Android Build Coastguard Worker
276b09eb04
Snap for 9735252 from b8a9fbf2db
to udc-release
...
Change-Id: Ide83b658ee684516ee5eeab0b6305259e7d64bcf
2023-03-14 01:27:53 +00: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
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
Android Build Coastguard Worker
e3c0e3a293
Snap for 9690662 from 469a54c625
to udc-release
...
Change-Id: Ia5e7803b7fe05739b30266ae5a99210aa0fc95f7
2023-03-05 00:01:37 +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
Android Build Coastguard Worker
7c97ad9fe4
Snap for 9682161 from 4dca43fbb3
to udc-release
...
Change-Id: I6ac6b71523233b4b892274633347cf36538a41eb
2023-03-03 02:07:09 +00:00
Android Build Coastguard Worker
1de34186b5
Snap for 9682271 from e5ddd8edf2
to tm-qpr3-release
...
Change-Id: I5d071bc087d70c4da6215c82d819ae91c6a1f4db
2023-03-03 00:01:44 +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