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

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

Merge "UserDataPreparer: reboot to recovery if preparing user storage fails" am: 39d90b7a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959659

Change-Id: I98b2d5d6b918e28d3d7a9e69df0787d3145a5130
parents 2a4deb39 39d90b7a

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

+8 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.pm.UserInfo;

import android.os.Environment;

import android.os.FileUtils;

import android.os.RecoverySystem;

import android.os.storage.StorageManager;

import android.os.storage.VolumeInfo;

import android.os.SystemProperties;
@@ -115,6 +116,13 @@ class UserDataPreparer { 
                // Try one last time; if we fail again we're really in trouble

                prepareUserDataLI(volumeUuid, userId, userSerial,

                    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);

                }

            }

        }

    }