Xin Li
128bda986e
[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: d0790ce78e
-s ours am: 96b58f52f7
-s ours
...
am skip reason: Merged-In I71444a2e9347c99b167e27423d9ddd2bb6e73378 with SHA-1 b5e30822d6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22722390
Change-Id: Ic7ca0896ca4fa135ea6883ad2fc6cc7f71d8ac02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:34:24 +00:00
Xin Li
96b58f52f7
[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: d0790ce78e
-s ours
...
am skip reason: Merged-In I71444a2e9347c99b167e27423d9ddd2bb6e73378 with SHA-1 b5e30822d6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22722390
Change-Id: Idbbd55b8771b78a90d61276b25f0792f0894114c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:38 +00:00
Xin Li
d0790ce78e
Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
...
Bug: 275386652
Merged-In: I71444a2e9347c99b167e27423d9ddd2bb6e73378
Change-Id: I31f220fcb674ab336b0ad707cfddecb470d4f887
2023-04-18 16:31:57 -07:00
Cyril Lee
647d2d0ae1
Revert^2 "[Quickstart] Turn off QS on legacy Pixels"
...
adbf67d1de
Change-Id: I748aab3d3ac6f9877da107a804e390d85e67a3fa
2023-04-18 09:38:00 +00:00
Leo Liou
8b30bcd03a
Merge "bluejay: conf: run ufs ffu script after boot complete" into udc-dev
2023-04-17 09:58:14 +00:00
Cyril Lee
adbf67d1de
Revert "[Quickstart] Turn off QS on legacy Pixels"
...
Revert submission 22606975-turn off qs
Reason for revert: confirm with team that this CL submit too early and need to rollback then submit again at 4/19.
Reverted changes: /q/submissionid:22606975-turn+off+qs
Change-Id: I24d478f4d49d0e1685e3ad797d6b3bc97967f1a6
2023-04-14 01:13:36 +00:00
Cyril Lee
771ba212e2
[Quickstart] Turn off QS on legacy Pixels
...
Bug: 277898824
Change-Id: I2faa36894265e373b62c500928d24a0128f9fafb
Test: manually test
2023-04-13 10:03:49 +00:00
Xin Li
fb060e0802
[automerger skipped] Merge TQ2A.230405.003 am: 733fdf46a0
am: 2fe7718140
-s ours am: 0259665c98
-s ours
...
am skip reason: Merged-In I2ade29622e6c01ade96a7b15609131635c7ac502 with SHA-1 b50a7c52a7
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2528310
Change-Id: Ied5909dd55ce8976e02df7e191fd507fb3f37cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:57:16 +00:00
Xin Li
0259665c98
[automerger skipped] Merge TQ2A.230405.003 am: 733fdf46a0
am: 2fe7718140
-s ours
...
am skip reason: Merged-In I2ade29622e6c01ade96a7b15609131635c7ac502 with SHA-1 b50a7c52a7
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2528310
Change-Id: I7a383f3ee31ab8f7ac8a55adeba94b3cd65a80cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:23:09 +00:00
Xin Li
2fe7718140
Merge TQ2A.230405.003 am: 733fdf46a0
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2528310
Change-Id: I1071cf0b55ddee2454fabe0df3d63db6c5256cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 19:01:01 +00:00
Xin Li
733fdf46a0
Merge TQ2A.230405.003
...
Bug: 271343657
Merged-In: I2ade29622e6c01ade96a7b15609131635c7ac502
Change-Id: Iec2828f674832bad4715986c0541303ec2ddfe7e
2023-04-10 23:54:56 -07:00
Steve Berbary
a3eb66a631
[automerge] Update bluejay SVN to 35 2p: b5e30822d6
am: 26f9eb394d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22558171
Change-Id: Id0eb76fcde2e9464369a8cbc8d1d810fc35c51c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 04:37:29 +00:00
Steve Berbary
26f9eb394d
[automerge] Update bluejay SVN to 35 2p: b5e30822d6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22558171
Bug: 277078610
Change-Id: I738869df3c6ec566c8b2ba32c0413bb4ee514ce2
2023-04-11 01:51:56 +00:00
Steve Berbary
b5e30822d6
Update bluejay SVN to 35
...
Bug: 277078610
Change-Id: I71444a2e9347c99b167e27423d9ddd2bb6e73378
2023-04-11 01:47:18 +00:00
Leo Liou
e3e61f15bc
bluejay: conf: run ufs ffu script after boot complete
...
The ufs script is to work for ffu preparing. If device's ufs has an
old firmware, the script will copy the valid firmware into disk and
wait for ffu update on bootloader.
Bug: 273305212
Test: full build and test ffu update
Change-Id: Ib5e2c57494ee22c33b93f1eda0e72049dcd12d16
Signed-off-by: Leo Liou <leoliou@google.com>
2023-03-31 17:01:31 +08:00
Steve Berbary
d1729790ae
Update bluejay SVN to 34 am: eefaee84db
am: 4cde0042ab
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22252412
Change-Id: Ica64d0a311ac521c4106e002a6631567e38dad32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 20:43:45 +00:00
Steve Berbary
4cde0042ab
Update bluejay SVN to 34 am: eefaee84db
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22252412
Change-Id: Ic82f351cac3bfb546089d992e231a97910dcde80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 20:12:29 +00:00
Steve Berbary
eefaee84db
Update bluejay SVN to 34
...
Bug: 272844037
Change-Id: Ie36f64888f46f0b08579f8b659a7fbde6c01b043
2023-03-24 18:47:25 +00:00
KRIS CHEN
fee239d2e8
Merge "Move udfps antispoof property to common g7 folder" into udc-dev
2023-03-24 03:25:01 +00:00
Steve Berbary
6c1c8ce908
Update bluejay SVN to 33 am: fa9b0a22c5
am: dfdc342d9e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22239192
Change-Id: I9bbdc5c0a1a3251f88025a05f5ca9e570e2c97c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 02:25:14 +00:00
Steve Berbary
dfdc342d9e
Update bluejay SVN to 33 am: fa9b0a22c5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22239192
Change-Id: I75a94dc8f982a78b2422c7ce393d739037e5885b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 01:54:55 +00:00
Steve Berbary
fa9b0a22c5
Update bluejay SVN to 33
...
Bug: 272844037
Change-Id: I02329be6d3de72e3241c9a5bb6b37709285cbbb9
2023-03-24 00:19:17 +00:00
Beverly Tai
b1482ebe4e
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev
2023-03-23 17:42:12 +00:00
chenkris
54644ec14c
Move udfps antispoof property to common g7 folder
...
Bug: 270657514
Test: authenticate fake finger
Change-Id: Ie67c13f6ab9e420b66a8e1dc77a9b27fcde8b6e6
2023-03-23 07:43:51 +00:00
Chris Paulo
2cde2eea98
Merge "device/bluejay: Add adaptive haptics props" into udc-dev
2023-03-22 21:58:49 +00:00
Beverly
6bac44096a
Remove unused dimen auth_ripple_alpha_in_duration
...
Bug: 274785453
Test: device builds
Change-Id: I256a62c02ba499a43ded9d6c8cf84df7be11a0ae
2023-03-22 18:23:16 +00:00
Steve Berbary
5b4000dc60
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I227895e754d1b285cd531e9c56a244325fcb6e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 07:39:50 +00:00
Steve Berbary
ea6b93a09e
Update bluejay SVN to 32 am: 9a862afe32
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I8a9916a4e9f0021ee583ef15ea1086aaed5a9719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 07:03:27 +00:00
Steve Berbary
9a862afe32
Update bluejay SVN to 32
...
Bug: 272844037
Change-Id: Id5aa5823a335291fba6da3ffcb481b841ef459a7
2023-03-15 02:18:02 +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
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
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
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