summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-02Snap for 11400057 from 7d71f05f9900f86aacd4065fe3b880eb3d9d7bac to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release Change-Id: I562eea008adf37b0f3f1e77227b5798d0e9c9769
2023-10-16Snap for 10957012 from d4969d6e727935cd2d76c6734d57a727dea2baef to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: If7cf460fb3bc4bcb9fcc38bf35807b8fce7cc885
2023-08-10Snap for 10641560 from d890ee393b98ef22c6824d1790783e1a8135effc to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I6f0bbc435df504995517de81f625f54fc40dfe09
2023-08-10InitialLockSetupHelper: fix chars <=> bytes conversion am: d890ee393b am: ↵ub-automotive-master-20240125Eric Biggers
d4969d6e72 am: 899c141878 am: 0f806a3506 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2700613 Change-Id: I99e808d049332b3341d5ca5793abc7dee654a23f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10InitialLockSetupHelper: fix chars <=> bytes conversion am: d890ee393b am: ↵Eric Biggers
d4969d6e72 am: 899c141878 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2700613 Change-Id: I04c27ea6d0621b6864f5a17a9602915d74fae3cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10InitialLockSetupHelper: fix chars <=> bytes conversion am: d890ee393b am: ↵Eric Biggers
d4969d6e72 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2700613 Change-Id: Icb42209225dfa40430e62d5e7e4b32cefbe75ae1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10InitialLockSetupHelper: fix chars <=> bytes conversion am: d890ee393bub-automotive-master-20231102ub-automotive-master-20231011Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2700613 Change-Id: I11905dbaf8255b47b4f3d3d4a6acbf76a90e64ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09InitialLockSetupHelper: fix chars <=> bytes conversionEric Biggers
InitialLockSetupService and KeyguardManager both expect the lockscreen credential as a UTF-8 encoded byte[]. Yet, the byte[] being passed in comes from InitialLockSetupHelper.charSequenceToByteArray(), which just truncates 'chars' to 'bytes'. Fix this to use a real UTF-8 conversion. This is necessary for non-ASCII characters in lockscreen credentials to be correctly rejected. With the truncation bug, a non-ASCII character could be truncated to an ASCII character and unexpectedly be accepted. Bug: 219511761 Bug: 232900169 Bug: 243881358 Test: presubmit Change-Id: I5c00186b3eeffac4f257247b889f8deed6f7a2bf Merged-In: I5c00186b3eeffac4f257247b889f8deed6f7a2bf (cherry picked from commit e5e33a76c0cd1c9997a038e1b896d64c8ae4fd5f)
2023-07-20Snap for 10448490 from 5aba12faf86c853f397d05ad6d55018a7c72dd5b to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ie6dff2b8cc4699b46f8d639fd06bbc8df32ee67e
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 264f1063bd -s ↵Xin Li
ours am: 9b3f1d7b1c -s ours am: 28e3dc87c3 -s ours am skip reason: Merged-In I00f5f8be751c8b5fc16a1c31fb34dfa2091066a5 with SHA-1 69e0ff3fae is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/24087541 Change-Id: I48141c9616075a8cb23d2d81caf5249b93a78752 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 264f1063bd -s ↵Xin Li
ours am: 9b3f1d7b1c -s ours am skip reason: Merged-In I00f5f8be751c8b5fc16a1c31fb34dfa2091066a5 with SHA-1 69e0ff3fae is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/24087541 Change-Id: Ic43fbdd24e7b4ceae49fc3408a4e5abb6ba053d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 264f1063bd -s oursXin Li
am skip reason: Merged-In I00f5f8be751c8b5fc16a1c31fb34dfa2091066a5 with SHA-1 69e0ff3fae is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/24087541 Change-Id: Ibb9d4002b9f730c150fc125442c72247059ce9ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I00f5f8be751c8b5fc16a1c31fb34dfa2091066a5 Change-Id: I6535732ee23a02d012b85968aa515cea995bbc62
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 5aba12faf8 -s ours am: ↵Xin Li
568942f1cf -s ours am: 5464e6f1c5 -s ours am: 62246c851f -s ours am: a73edf3b57 -s ours am skip reason: Merged-In If24bfd238bf87d11b4107887c0a60afc06206743 with SHA-1 fcc59aac1e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2635530 Change-Id: Iaed536927998b28e1ae451a0e2c5d3cb9bfced6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 5aba12faf8 -s ours am: ↵Xin Li
568942f1cf -s ours am: 5464e6f1c5 -s ours am: 62246c851f -s ours am skip reason: Merged-In If24bfd238bf87d11b4107887c0a60afc06206743 with SHA-1 fcc59aac1e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2635530 Change-Id: I32cc527e004b2df0f365901372c192d0a25c474a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 5aba12faf8 -s ours am: ↵Xin Li
568942f1cf -s ours am: 5464e6f1c5 -s ours am skip reason: Merged-In If24bfd238bf87d11b4107887c0a60afc06206743 with SHA-1 fcc59aac1e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2635530 Change-Id: I3bea687bf95805c0a6e4202792b0321ccc9330f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26[automerger skipped] Merge Android 13 QPR3 am: 5aba12faf8 -s ours am: ↵Xin Li
568942f1cf -s ours am skip reason: Merged-In If24bfd238bf87d11b4107887c0a60afc06206743 with SHA-1 fcc59aac1e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2635530 Change-Id: If68dde29efc50bc48d61b0ac1f66e54de38cfec5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26[automerger skipped] Merge Android 13 QPR3 am: 5aba12faf8 -s oursXin Li
am skip reason: Merged-In If24bfd238bf87d11b4107887c0a60afc06206743 with SHA-1 fcc59aac1e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2635530 Change-Id: I657b25b6cdd3b57f615fe3ea9a766427c218c7c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21Merge Android 13 QPR3Xin Li
Bug: 275386652 Merged-In: If24bfd238bf87d11b4107887c0a60afc06206743 Change-Id: I7e929183889aee833b41c0efb92ccb4f976b2029
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fcc59aac1e -s ours am: 3f6b4603a2 -s ours am: 69e0ff3fae -s ours am skip reason: Merged-In I37ca7d0b5eec178f993770ba806fc428b7eda0c8 with SHA-1 f212a943a3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/22725127 Change-Id: Iace40d6e0081e61f6453df144dca0fb1430a2be7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fcc59aac1e -s ours am: 3f6b4603a2 -s ours am skip reason: Merged-In I37ca7d0b5eec178f993770ba806fc428b7eda0c8 with SHA-1 f212a943a3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/22725127 Change-Id: I00f5f8be751c8b5fc16a1c31fb34dfa2091066a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fcc59aac1e -s ours am skip reason: Merged-In I37ca7d0b5eec178f993770ba806fc428b7eda0c8 with SHA-1 f212a943a3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/22725127 Change-Id: I14638fd6c78b4a7e6cf7605c5ba12770a0975a7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994temp_275386652Xin Li
Bug: 275386652 Merged-In: I37ca7d0b5eec178f993770ba806fc428b7eda0c8 Change-Id: If24bfd238bf87d11b4107887c0a60afc06206743
2023-03-15Snap for 9751898 from 918a28eb91f888b1296691c91e91ad4d477b2a43 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ieb683c77d4813299291f5280f5b032a330ff545a
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 918a28eb91 -s ours am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseXin Li
2e3fcecf12 -s ours am: 8fde294d5f -s ours am: d27cc87c8a -s ours am skip reason: Merged-In I4c7299077b97443e0db1675b800a546949dff1e8 with SHA-1 1c1f3be1de is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2487196 Change-Id: Ida33d10ca8fc02657e4a709e976f1e3f920b7235 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 918a28eb91 -s ours am: ↵android14-devXin Li
2e3fcecf12 -s ours am: 8fde294d5f -s ours am skip reason: Merged-In I4c7299077b97443e0db1675b800a546949dff1e8 with SHA-1 1c1f3be1de is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2487196 Change-Id: I888269b205135699f0214a8e27c274b567fc44a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 918a28eb91 -s ours am: ↵Xin Li
2e3fcecf12 -s ours am skip reason: Merged-In I4c7299077b97443e0db1675b800a546949dff1e8 with SHA-1 1c1f3be1de is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2487196 Change-Id: I099524edc934b74580cff1820dc48b933dd1816e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 918a28eb91 -s oursXin Li
am skip reason: Merged-In I4c7299077b97443e0db1675b800a546949dff1e8 with SHA-1 1c1f3be1de is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2487196 Change-Id: I7653081e6567cd6f5829f3095adc81daa9e5fe36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge Android 13 QPR2ub-automotive-master-20230622ub-automotive-master-20230427android-u-beta-1-gplXin Li
Bug: 273316506 Merged-In: I4c7299077b97443e0db1675b800a546949dff1e8 Change-Id: Icaba2db6ef71eb4a77eb48a02e8a69601448b775
2023-03-10[automerger skipped] Add API to provide complexity validation error am: ↵Alan Chen
f212a943a3 am: cb05d37302 -s ours am: 1a2d498a84 -s ours am skip reason: Merged-In I37ca7d0b5eec178f993770ba806fc428b7eda0c8 with SHA-1 d07f5b1320 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21871933 Change-Id: I0444776657d2cb894ac51c86cd45194b94659141 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10[automerger skipped] Add API to provide complexity validation error am: ↵Alan Chen
f212a943a3 am: cb05d37302 -s ours am skip reason: Merged-In I37ca7d0b5eec178f993770ba806fc428b7eda0c8 with SHA-1 d07f5b1320 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21871933 Change-Id: I801b141aa7307d6f7b5ddf743a75d5948814023b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10Add API to provide complexity validation error am: f212a943a3Alan Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21871933 Change-Id: Id8bdf7b40a8f5d08e73b5d7d66baa1b819d8ac85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08Add API to provide complexity validation errorandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseAlan Chen
Currently there is no method for SUW to retrieve the feedback String when user password/PIN/pattern does not meet the complexity requirement. We create a new API checkValidLockForMessage to retrieve the respective Strings shown to users in Settings when password does not meet the requirement. Additionally, we update LIBRARY_VERSION to 2. Bug: 268506426 Test: manual - build passes when InitialSetupService in CarSettings implements the method Change-Id: I37ca7d0b5eec178f993770ba806fc428b7eda0c8 Merged-In: I37ca7d0b5eec178f993770ba806fc428b7eda0c8
2023-03-07Merge "Add API to provide complexity validation error" into udc-dev am: ↵Alan Chen
2d67d57a4d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21572471 Change-Id: If52e1ec5898350998fdb6d80081a47284af6b4d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Merge "Add API to provide complexity validation error" into udc-devAlan Chen
2023-03-06Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: dd7850adc5 am: 1645958ec9 am: 47ea97536f am: c57c5f85a3 am: 6e8716797f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21754519 Change-Id: Ieded1670a3069ed0eab27f3c9d4db966aafc64fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: dd7850adc5 am: 1645958ec9 am: 47ea97536f am: c57c5f85a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21754519 Change-Id: I28a84e55cc14c942b2ffcd93044260eabe6c24aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: dd7850adc5 am: bb675954c6 am: 5cbf0b3817 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21754519 Change-Id: If4273cee8a664d81cdd40ff27d1e740402306b77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: dd7850adc5 am: 1645958ec9 am: 47ea97536f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21754519 Change-Id: I696b2efce892d09b5ab8cc124dfb9ef9a37d5665 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: dd7850adc5 am: 1645958ec9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21754519 Change-Id: I6c43fc650e900a2a48dac8724539525e47e7b376 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: dd7850adc5 am: bb675954c6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21754519 Change-Id: I8cef125f8fcb424f54f240e3af84988c55434d9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: dd7850adc5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21754519 Change-Id: Ib98f14b1636e40e316fe98e2ef83803ebc34a6af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: dd7850adc5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/21754519 Change-Id: I0b1c92a3ed4612aa1b1f6706ed26fc18f372c504 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. Bug: 261728063 Test: atest CarSetupWizardLibRoboTests Git diff of test summary was identical. Change-Id: Iff8351916162667fbf95942a6de6285cd251ed70
2023-02-27Add API to provide complexity validation errorAlan Chen
Currently there is no method for SUW to retrieve the feedback String when user password/PIN/pattern does not meet the complexity requirement. We create a new API checkValidLockForMessage to retrieve the respective Strings shown to users in Settings when password does not meet the requirement. Additionally, we update LIBRARY_VERSION to 2. Bug: 268506426 Test: manual - build passes when InitialSetupService in CarSettings implements the method Change-Id: I37ca7d0b5eec178f993770ba806fc428b7eda0c8
2023-02-24Snap for 9652768 from 50f6d8581f6b537a5c41c00f00ad84afd8ade9ee to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I0f6a8585c0dbeaac2b6a81c52fda45db1c216d52
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
25a68e5b31 -s ours am: 9a25062a25 -s ours am skip reason: Merged-In I4c7299077b97443e0db1675b800a546949dff1e8 with SHA-1 1c1f3be1de is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/20956647 Change-Id: Ib4f89740eea8adf8df6872aa0256484c48de34bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
25a68e5b31 -s ours am skip reason: Merged-In I4c7299077b97443e0db1675b800a546949dff1e8 with SHA-1 1c1f3be1de is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/20956647 Change-Id: I84f8cd0f2d7555025f064f250c892050dca8228a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: I4c7299077b97443e0db1675b800a546949dff1e8 Change-Id: Iaaf8f1fb886fc4646a6d501e9a2eba096555d128
2022-12-05[automerger skipped] Migrate from Robolectric prebuilt 4.5.1 to 4.8.2 am: ↵Sorin Basca
1c1f3be1de -s ours am skip reason: Merged-In I4c7299077b97443e0db1675b800a546949dff1e8 with SHA-1 522ea9b663 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/20641672 Change-Id: Ie16ff6b4adf076f94cbc3cb87a8f60c8937a05b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 05:57:17 +0000