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

UserDataPreparer: reboot to recovery for system user only

Browse Source 
With the next CL, old devices might contain a combination of old users
with prepareUserStorage error checking disabled and new users with
prepareUserStorage error checking enabled.  Factory resetting the whole
device when any user fails to prepare may be too aggressive.  Also,
UserDataPreparer already destroys the affected user's storage when it
fails to prepare, which seems to be fairly effective at breaking things
for that user (absent proper error handling by upper layers).

Therefore, let's only factory reset the device if the failing user is
the system user.

Bug: 164488924
Bug: 216025819
Change-Id: Ia1db01ab4ec6b3b17d725f391c3500d92aa00f97
This commit is contained in:
Eric Biggers
2022-03-04 00:07:29 +00:00
parent b49e2b9cf1
commit 4c76da76c9
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);
} else {
try {
Log.e(TAG, "prepareUserData failed", e);
RecoverySystem.rebootPromptAndWipeUserData(mContext, "prepareUserData failed");
Log.wtf(TAG, "prepareUserData failed for user " + userId, e);
if (userId == UserHandle.USER_SYSTEM) {
RecoverySystem.rebootPromptAndWipeUserData(mContext,
"prepareUserData failed for system user");
}
} catch (IOException e2) {
throw new RuntimeException("error rebooting into recovery", e2);
}