Steve Berbary
eefaee84db
Update bluejay SVN to 34
...
Bug: 272844037
Change-Id: Ie36f64888f46f0b08579f8b659a7fbde6c01b043
2023-03-24 18:47:25 +00:00
Automerger Merge Worker
32fde3ac5e
Merge "Merge "Move udfps antispoof property to common g7 folder" into udc-dev am: fee239d2e8
am: 95dcd72604
"
2023-03-24 04:23:01 +00:00
KRIS CHEN
3558860631
Merge "Move udfps antispoof property to common g7 folder" into udc-dev am: fee239d2e8
am: 95dcd72604
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22216488
Change-Id: Id5536565cf88e0e68694108c918d966f343030bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 04:22:36 +00:00
KRIS CHEN
77043768a5
Merge "Move udfps antispoof property to common g7 folder" into udc-dev am: fee239d2e8
am: 6d22a16098
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22216488
Change-Id: I790cce0df0992752302d9e30bf21d172a0d225b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 04:22:32 +00:00
KRIS CHEN
95dcd72604
Merge "Move udfps antispoof property to common g7 folder" into udc-dev am: fee239d2e8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22216488
Change-Id: I95dfc83f3a9a963489f8c98cb41c4c4efbcbdd96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:53:46 +00:00
KRIS CHEN
6d22a16098
Merge "Move udfps antispoof property to common g7 folder" into udc-dev am: fee239d2e8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22216488
Change-Id: If292a3fcf5d677d0f6bc6d321b2c72a1b3bc3eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:53:41 +00:00
Steve Berbary
2c2af36784
Update bluejay SVN to 33 am: fa9b0a22c5
am: dfdc342d9e
am: 6c1c8ce908
am: fe4743dd52
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22239192
Change-Id: Ic4c80d9884fff29834149ea620cd0b707e59e34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:26:37 +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
e0369461e4
Update bluejay SVN to 33 am: fa9b0a22c5
am: dfdc342d9e
am: 6c1c8ce908
am: 0bef0773eb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22239192
Change-Id: Ibc465c4e5d68dac44c0fee0a53b645542500cc3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:24:45 +00:00
Steve Berbary
0bef0773eb
Update bluejay SVN to 33 am: fa9b0a22c5
am: dfdc342d9e
am: 6c1c8ce908
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22239192
Change-Id: I428297848e59b778e8c7717152ec15090885e01b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 02:56:08 +00:00
Steve Berbary
fe4743dd52
Update bluejay SVN to 33 am: fa9b0a22c5
am: dfdc342d9e
am: 6c1c8ce908
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22239192
Change-Id: Ia8cbf06ad1401bd157a44f1874cc7e91d286b508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 02:56:05 +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
9e41ed6499
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev am: b1482ebe4e
am: 679dd121ef
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22200424
Change-Id: Ic7bf0af876990f14f5dfe084aa7bb43a43aa1581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:40:33 +00:00
Beverly Tai
b5735827da
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev am: b1482ebe4e
am: 55f27462f7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22200424
Change-Id: I7a1f61dacfe3436c0b93a1f2fb5f0429649c97fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:32:49 +00:00
Beverly Tai
679dd121ef
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev am: b1482ebe4e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22200424
Change-Id: Iba5e6635c684e2627520eb4de62369dd7ab23d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:29:03 +00:00
Android Build Coastguard Worker
b82eea3684
[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L87300000959339500 into tm-qpr2-release.
...
COASTGUARD_SKIP: Ieecf6c076245eab8eff5628c386dd220be4306bc
COASTGUARD_SKIP: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
COASTGUARD_SKIP: If9eba1862e49fe31462b8f114b459c21e95d4549
Change-Id: I797b9b17ac593f1450bf893ed55fadae927a4df6
2023-03-23 17:54:23 +00:00
Beverly Tai
55f27462f7
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev am: b1482ebe4e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22200424
Change-Id: I23a6aa2c162ae1bd2285dda5e05bc71cff9aaf02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 17:48:41 +00:00
Android Build Coastguard Worker
2a1e033915
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196', 'googleplex-android-review.googlesource.com/22078385'] into sparse-9719927-L87300000959339500.
...
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549
SPARSE_CHANGE: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
Change-Id: Ieecf6c076245eab8eff5628c386dd220be4306bc
2023-03-23 17:47:07 +00:00
Steve Berbary
9c01301e79
Update bluejay SVN to 31
...
Bug: 272844037
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de230640ea29f6d71f460dbad737aab2c4ed3611 )
Merged-In: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
Change-Id: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
2023-03-23 17:44:05 +00:00
Steve Berbary
501f606118
Update bluejay SVN to 30
...
Bug: 268558932
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e5ddd8edf2a90ef2ea78b0de8dbd253669e4f7e8 )
Merged-In: If9eba1862e49fe31462b8f114b459c21e95d4549
Change-Id: If9eba1862e49fe31462b8f114b459c21e95d4549
2023-03-23 17:43:58 +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
ff3db7ecdf
Merge "device/bluejay: Add adaptive haptics props" into udc-dev am: 2cde2eea98
am: 959c69113d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21806659
Change-Id: I68440d78d1d3acba485a079d8a8e8e906d1bd108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 23:24:16 +00:00
Chris Paulo
46bc30e044
Merge "device/bluejay: Add adaptive haptics props" into udc-dev am: 2cde2eea98
am: ef8e14b041
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21806659
Change-Id: I77988abb3b92127f84e0cee941a1ac21ff897a7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 23:17:22 +00:00
Chris Paulo
959c69113d
Merge "device/bluejay: Add adaptive haptics props" into udc-dev am: 2cde2eea98
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21806659
Change-Id: Id2d1e415c446664b0b85a0a0e77237f0d77387d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:37:58 +00:00
Chris Paulo
ef8e14b041
Merge "device/bluejay: Add adaptive haptics props" into udc-dev am: 2cde2eea98
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21806659
Change-Id: If1df761089f6c1f20a26ca7141e70adedf05ee06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:37:56 +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
Android Build Coastguard Worker
87d48b5f07
[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L98000000959299536 into tm-qpr2-release.
...
COASTGUARD_SKIP: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
COASTGUARD_SKIP: I0cea8c12d9f6903e82d2322a05a878d12c198196
COASTGUARD_SKIP: If9eba1862e49fe31462b8f114b459c21e95d4549
Change-Id: I80c6d8cdb213eaa26132e9cd05b5185540adbe4c
2023-03-22 04:20:42 +00:00
Android Build Coastguard Worker
ff938fd142
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196', 'googleplex-android-review.googlesource.com/22078385'] into sparse-9719927-L98000000959299536.
...
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549
SPARSE_CHANGE: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
Change-Id: I0cea8c12d9f6903e82d2322a05a878d12c198196
2023-03-22 04:10:33 +00:00
Steve Berbary
780232b30f
Update bluejay SVN to 31
...
Bug: 272844037
Change-Id: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
(cherry picked from commit on googleplex-android-review.googlesource.com host: de230640ea
)
Merged-In: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
2023-03-22 04:08:14 +00:00
Steve Berbary
ae5b077989
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-22 04:08:08 +00:00
Android Build Coastguard Worker
279ea021ee
[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L02000000959258504 into tm-qpr2-release.
...
COASTGUARD_SKIP: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
COASTGUARD_SKIP: I0616ce4a686a482c83e202374efbf3851047d1b8
COASTGUARD_SKIP: If9eba1862e49fe31462b8f114b459c21e95d4549
Change-Id: If7da9f5522ae56dd5222a6bca8058f90c90965c0
2023-03-21 03:54:23 +00:00
Android Build Coastguard Worker
c224212b4c
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196', 'googleplex-android-review.googlesource.com/22078385'] into sparse-9719927-L02000000959258504.
...
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549
SPARSE_CHANGE: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
Change-Id: I0616ce4a686a482c83e202374efbf3851047d1b8
2023-03-21 03:47:46 +00:00
Steve Berbary
da388886a8
Update bluejay SVN to 31
...
Bug: 272844037
Change-Id: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
(cherry picked from commit on googleplex-android-review.googlesource.com host: de230640ea
)
Merged-In: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
2023-03-21 03:46:27 +00:00
Steve Berbary
e7f3f7017e
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-21 03:46:24 +00:00
Steve Berbary
7ab528f69c
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
am: 5b4000dc60
am: 2c65d83d7d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I5c3e38d9f7923298b7581105d9c1e9cbf92d8b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 08:53:34 +00:00
Steve Berbary
e8b62bd909
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
am: 5b4000dc60
am: 2bd82fe257
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I742c3300a8679a6e082901b3eb94cf6a2feeb582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 08:51:58 +00:00
Steve Berbary
2c65d83d7d
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
am: 5b4000dc60
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I82a021fc61aaeb430d0902c3019f75c6e7fad06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 08:18:06 +00:00
Steve Berbary
2bd82fe257
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
am: 5b4000dc60
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I716caf0e4ef106d75e6a59eae530a1597c3e0cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 08:18:03 +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
Automerger Merge Worker
1eefeeb8fe
Merge "[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours am: 411e3fd108
-s ours"
2023-03-15 02:16:05 +00:00
Xin Li
019c1c7404
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours am: 411e3fd108
-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: I98f81059ff52b0a267cea67c99cc6404ea6593e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 02:04:03 +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
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
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