Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,131 Commits 3 Branches 0 Tags
d6bfc716ec278006ddacfa03d559d3ccdd448cb4
Commit Graph

661131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Biggers
d6bfc716ec [automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours am: 5589682f84 -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585

Change-Id: I7beaa54c3c28c7bf3d9be37b41adefc8e476c5f6
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:57 +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
Eric Biggers
5589682f84 [automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585

Change-Id: I595cdd8bae0081fb867a62e2bc0194072180b1d9
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:38 +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
58c7fa1a92 [automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585

Change-Id: I897abfec9e7eab4e6573b38e7e2c36758672be99
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:41 +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
8d8f4691df [automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585

Change-Id: I87e9b17cc0a4e1d8a9169dd4312df745ed33726a
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:28 +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
Eric Biggers
c601e32e9e Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585

Change-Id: I8aabcb59d973c1c54d465336410d30b53ce12618
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:19 +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
Eric Biggers
a318c254f7 Merge changes from topic "unencrypted-dirs-q" into qt-dev 
* changes:
  [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure
  [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users
  [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only
  [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails
  [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage
  Check user unlocked before write to /data/system_ce/0/snapshots
 2022-04-25 17:11:39 +00:00
Joe Bolinger
2f91e4e8d5 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: I51a7f516c0ddd3a99b4f906cdaa361e5f1652aec
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 00:15:31 +00:00
Joe Bolinger
110c9b4c1e Merge changes from topic "cve-fp-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-mainline-prod 
* changes:
  [automerge] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. 2p: ac89f8682f
  [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService.
 2022-04-22 23:43:45 +00:00
Joe Bolinger
c8347811b2 Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev 2022-04-22 23:43:44 +00:00
Eric Biggers
a7f9adbc94 [automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: Ic6acb7e15810454d0ad2eedee4398e9af44d0f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:23:17 +00:00
Eric Biggers
fc90023265 [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: Ibc085615ee2238bb7eea51aa7e1f49a45f78f2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:23:14 +00:00
Eric Biggers
74699e901a [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250

Change-Id: I7bff50b60c819687ec5cafd43739e16269a5f5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:23:05 +00:00
Eric Biggers
468c5c5a2f [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249

Change-Id: I33a2e1607897c76695026069650fd9b07b3fa67b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:23:00 +00:00
Eric Biggers
79f227182b [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248

Change-Id: Ie7e90f9d053de78a26899653bc0a8c19aef951b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:22:40 +00:00
Eric Biggers
ceb59ff994 [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247

Change-Id: I8a0efff807a7d11e9a6b199966443d994cc3752c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:22:30 +00:00
Eric Biggers
ff2c282fb4 [automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: I647f13be357f4d5d19d2577210113c26324fb8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:01:01 +00:00
Eric Biggers
54a7bd48dc [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: I85a4346eec74128ae6e9b1bb99e3e96e43c50aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:53 +00:00
Eric Biggers
0f285346e5 [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250

Change-Id: I915cad24ff570c667508f9de0fef3e69c25df310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:46 +00:00
Eric Biggers
ef37c0da49 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249

Change-Id: I876562e133dec3532333cf684b95b4d282682bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:38 +00:00
Eric Biggers
39bf332aab [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248

Change-Id: Iba7aa9d2bbacce83e543d86e798615d2b3aa0625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:30 +00:00