Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724

Browse Source 
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>
This commit is contained in:
Eric Biggers
2022-04-25 18:04:44 +00:00
committed by Automerger Merge Worker
parent 245e455114 a296a2b724
commit 6976474816
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/UserDataPreparer.java
View File

@@ -118,8 +118,11 @@ class UserDataPreparer {
flags | StorageManager.FLAG_STORAGE_DE, false); flags | StorageManager.FLAG_STORAGE_DE, false);
} else { } else {
try { try {
Log.e(TAG, "prepareUserData failed", e); Log.wtf(TAG, "prepareUserData failed for user " + userId, e);
RecoverySystem.rebootPromptAndWipeUserData(mContext, "prepareUserData failed"); if (userId == UserHandle.USER_SYSTEM) {
RecoverySystem.rebootPromptAndWipeUserData(mContext,
"prepareUserData failed for system user");
}
} catch (IOException e2) { } catch (IOException e2) {
throw new RuntimeException("error rebooting into recovery", e2); throw new RuntimeException("error rebooting into recovery", e2);
} }