Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69764748 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

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

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: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 245e4551 a296a2b7

services/core/java/com/android/server/pm/UserDataPreparer.java

+5 −2
Original line number Diff line number Diff line
@@ -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);

                }