diff options
| author | 2022-04-20 21:04:17 +0000 | |
|---|---|---|
| committer | 2022-04-20 21:04:17 +0000 | |
| commit | d4f7100ba017c6cc64362deaa30a6987b28ca93c (patch) | |
| tree | 871919c3ec1657bb2e32d92c3a6e4c807bf81339 | |
| parent | 9eec832b846b4af6d049f228dfe27824ad00afff (diff) | |
| parent | 7abafd53c95cdec5ec54838bc72515654ce1e089 (diff) | |
UserDataPreparer: reboot to recovery for system user only am: fd31f740ce am: 7abafd53c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416118
Change-Id: I8b5b985cc351e60f0d660ac9ea00062ec7749597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/UserDataPreparer.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/UserDataPreparer.java b/services/core/java/com/android/server/pm/UserDataPreparer.java index 504769064808..95482d7c7f1a 100644 --- a/services/core/java/com/android/server/pm/UserDataPreparer.java +++ b/services/core/java/com/android/server/pm/UserDataPreparer.java @@ -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); } |