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

[RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6

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

Change-Id: Icbaf5892b2804757bc831533fbf2adf851f89f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2022-04-20 21:39:22 +00:00
committed by Automerger Merge Worker
parent ee88d1fd14 69c3ce70c6
commit d685b63f1a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ import android.content.Context;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.os.Environment; import android.os.Environment;
import android.os.FileUtils; import android.os.FileUtils;
import android.os.RecoverySystem;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
import android.os.SystemProperties; import android.os.SystemProperties;
@@ -115,6 +116,13 @@ class UserDataPreparer {
// Try one last time; if we fail again we're really in trouble // Try one last time; if we fail again we're really in trouble
prepareUserDataLI(volumeUuid, userId, userSerial, prepareUserDataLI(volumeUuid, userId, userSerial,
flags | StorageManager.FLAG_STORAGE_DE, false); flags | StorageManager.FLAG_STORAGE_DE, false);
} else {
try {
Log.e(TAG, "prepareUserData failed", e);
RecoverySystem.rebootPromptAndWipeUserData(mContext, "prepareUserData failed");
} catch (IOException e2) {
throw new RuntimeException("error rebooting into recovery", e2);
}
} }
} }
} }