Eric Biggers
|
b87de79cdd
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours am: 3a4170de4b -s ours am: 873280e588 -s ours am: bfcb7f53de -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: Ia20bc5bc3863c0484b23e1ac9edb57f62e43dcc7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:21:19 +00:00 |
|
Eric Biggers
|
e071fa6574
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours am: 04ef13bd8e -s ours am: 1607beeb83 -s ours am: 798e6d78c6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: I038082f3a87407952dea7ccea2888e096547537e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:21:08 +00:00 |
|
Eric Biggers
|
20664186b9
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours am: 3d81f75d82 -s ours am: 702169ebe7 -s ours am: 0fc8902874 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: I16dde899645c2f5f8e88023a7d287bf041b06343
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:58 +00:00 |
|
Eric Biggers
|
00a0d7595a
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours am: 00f6398e69 -s ours am: e523e5de72 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: Ic614e690ed06139c8fbfecab2adbcf6bfc53af75
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:50 +00:00 |
|
Eric Biggers
|
aa4f6435a0
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours am: 9c2aaf60a0 -s ours am: bc8f7869a2 -s ours am: 1c53dec76a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: I6c02c32504ea8e825425b488df8bb91ac0509464
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:39 +00:00 |
|
Guo Li
|
f26b98e73e
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours am: 34842572ca -s ours am: 1314db8f3e -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: Id0eb8b55edd9d3afee6302d21a7f4e1b83c791c6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:14 +00:00 |
|
Eric Biggers
|
bfcb7f53de
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours am: 3a4170de4b -s ours am: 873280e588 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: I3cc149d3b27b7e2ce6553dabef3ba936ba8d379e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:51 +00:00 |
|
Eric Biggers
|
798e6d78c6
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours am: 04ef13bd8e -s ours am: 1607beeb83 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: If2441420fb73350dfe1852eb74b193405cd698cf
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:36 +00:00 |
|
Eric Biggers
|
0fc8902874
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours am: 3d81f75d82 -s ours am: 702169ebe7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: I33512e74cfb082f2baf99ab10101f605c1635d44
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:34 +00:00 |
|
Eric Biggers
|
e523e5de72
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours am: 00f6398e69 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: Iaaf1988e324331a925689c527c4400c6302f4701
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:31 +00:00 |
|
Eric Biggers
|
1c53dec76a
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours am: 9c2aaf60a0 -s ours am: bc8f7869a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: I5b6dc0b6cd366362ddaabf7adb106857b6d97fab
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:20 +00:00 |
|
Guo Li
|
1314db8f3e
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours am: 34842572ca -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I948cd2c48b2be844ffaf96fe88ea066ce5cfbd09
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:08 +00:00 |
|
Siim Sammul
|
48ecaf9d88
|
Merge "Count the number of dropped events due to rate limiting and attach that number to the header of the dropbox entry." into tm-dev
|
2022-04-25 19:42:18 +00:00 |
|
Antoan Angelov
|
6327cfe89b
|
Merge "Update javadocs for EXTRA_ROLE_HOLDER_UPDATE_RESULT_CODE" into tm-dev
|
2022-04-25 19:32:44 +00:00 |
|
Eric Biggers
|
873280e588
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours am: 3a4170de4b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: If2d939095abe20d3e9a2e49dd4244e42523169dd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:17:20 +00:00 |
|
Eric Biggers
|
1607beeb83
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours am: 04ef13bd8e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: I7e54ed942b99640afb4b89f819bc9ba9535b3c79
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:17:13 +00:00 |
|
Eric Biggers
|
702169ebe7
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours am: 3d81f75d82 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: Ic6fbed4def949f2cf0d3d6bf3ccc012862bc02c7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:16:49 +00:00 |
|
Eric Biggers
|
00f6398e69
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: Iaf720085ce87e3963d9ba255e4bac2737b2ac8ef
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:16:42 +00:00 |
|
Eric Biggers
|
bc8f7869a2
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours am: 9c2aaf60a0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: I2bdc9babd4d9137cfb8148f7fb707ecb9796b35b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:16:20 +00:00 |
|
Guo Li
|
34842572ca
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I00782e2bd155cad54693fc8dc36edd371d5765aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:16:02 +00:00 |
|
Eric Biggers
|
3a4170de4b
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: Icf976a1974771063c100ff6ccc24f6ea54885371
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:58:32 +00:00 |
|
Eric Biggers
|
04ef13bd8e
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: Id6f26bc7d92adf1e66fcb15b5f93e33a8e93f91d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:58:21 +00:00 |
|
Eric Biggers
|
3d81f75d82
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: Idf80c2fac5b9196b8070a3e6c11b9c09863f93e8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:58:06 +00:00 |
|
Eric Biggers
|
1fed4175e8
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: Iaa9db142672f3d8b6fd31a661d46da112a2cf357
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:58:04 +00:00 |
|
Eric Biggers
|
9c2aaf60a0
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: I26c496eca9f984adea86183f83413ab5ce586ea0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:57:55 +00:00 |
|
Guo Li
|
74c35b4663
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I0164d26a3cc1f7d549b8035514235370771f985e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:57:52 +00:00 |
|
Eric Biggers
|
393fde64bc
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: Ib55b6f29c71f9ded521126959eccd176cf0d72bb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:36:21 +00:00 |
|
Eric Biggers
|
d1951beae5
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: Ib4fba728b1e2a9fe470f6f5506f1888fef284424
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:36:06 +00:00 |
|
Eric Biggers
|
4ec9daeef7
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: Ief515b43404cebc45aeb8a1451157228e2c81591
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:36:02 +00:00 |
|
Eric Biggers
|
00401eda09
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: I1c789ae9750081d4d11269e37ae2c078befb1a0c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:35:53 +00:00 |
|
Eric Biggers
|
42b5cbc663
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: Ibd1ddea797689c5f648ebb6f2dff3e0fc5c0b97d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:35:34 +00:00 |
|
Guo Li
|
c63b0311a6
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I488f8a2b616a79302112d7a4f10e895c9679d00a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:35:27 +00:00 |
|
Joe Bolinger
|
d38f05b58f
|
[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2 am: c53247615d -s ours am: 00a442d67a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: Ieb4192b6b11fdc8c88e61ac9ccc1d766aaf9fc20
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:17:42 +00:00 |
|
Joe Bolinger
|
66270fcd48
|
[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f8682f -s ours am: 5410ad42bc -s ours am: 3b8fef3d48 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: I12f703171de5876f106984d7cfe2948e9706f6c3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:17:21 +00:00 |
|
Eric Biggers
|
51fbb8e819
|
[RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: Ibb1049aa4c143ba2d4e04a021cb2546519a1996e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:05:06 +00:00 |
|
Eric Biggers
|
7271432de9
|
[RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: Ic637e5b26c0bb2561497dfb7ba1cf5300bd6af99
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:05:04 +00:00 |
|
Eric Biggers
|
6976474816
|
[RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: Idb8510091bb7e626d037f2245805ed6daa9af64e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:04:44 +00:00 |
|
Eric Biggers
|
245e455114
|
[RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: Ie98301125accca1074aa5f7e4ea4f51cfdbd8cd7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:04:30 +00:00 |
|
Eric Biggers
|
9d4c8b604a
|
[RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: If7e2bb688e37a55b874d25f4e1621f3998b4d9af
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:04:16 +00:00 |
|
Guo Li
|
5f72388c49
|
Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I6d083a2930244ee65e5f17d2d61e1f9e0884d94e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 18:04:01 +00:00 |
|
Rachel Lee
|
c2c8ac85ea
|
Merge "Add check for empty vsync data in Choreographer." into tm-dev
|
2022-04-25 18:03:56 +00:00 |
|
Joe Bolinger
|
00a442d67a
|
[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2 am: c53247615d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: I0b2c74777bf4bdce8f85e9d1b48f1188d951649b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 17:50:24 +00:00 |
|
Joe Bolinger
|
3b8fef3d48
|
[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f8682f -s ours am: 5410ad42bc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: Id36cf5a90a2a4fad6096f827a878669ae0499b34
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 17:50:10 +00:00 |
|
Dave Mankoff
|
c6de69d8a5
|
Merge changes from topic "presubmit-am-8d46ef8e146342db89da2c1ff44742ea" into tm-dev
* changes:
Tell NavigationBarView when mode changes.
Revert "Revert "Remove Dep.get(CommandQueue.class) from NavBarView""
|
2022-04-25 17:48:14 +00:00 |
|
TreeHugger Robot
|
1fe672f135
|
Merge "PanelExpansionStateManager: add new parameter for raw drag amount" into tm-dev
|
2022-04-25 17:44:26 +00:00 |
|
TreeHugger Robot
|
eae3e16acb
|
Merge "Fix touch on QQS tiles" into tm-dev
|
2022-04-25 17:23:35 +00:00 |
|
Joe Bolinger
|
c53247615d
|
Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: I9a9bf3b5f7ccdc1198c012e495cd42c55f51f296
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 17:14:50 +00:00 |
|
Joe Bolinger
|
5410ad42bc
|
[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f8682f -s ours
am skip reason: skipped by user jbolinger
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: I076199e318c89af583c64a8bd66ec854719cc975
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 17:14:41 +00:00 |
|
Jing Ji
|
839f3298ad
|
Merge "Add other tracker info in the bg restriction metrics" into tm-dev
|
2022-04-25 16:57:47 +00:00 |
|
arangelov
|
6f1c9c3295
|
Update javadocs for EXTRA_ROLE_HOLDER_UPDATE_RESULT_CODE
Also ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER
Bug: 230098812
Test: none
Change-Id: Ib06b40bec7d32c32f044822b48ff7e8ebcb220a4
|
2022-04-25 16:44:51 +01:00 |
|