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

Commit 7cc92c6d authored by Paul Crowley's avatar Paul Crowley Committed by android-build-merger
Browse files

Merge "Continue to remove users when destroyUserKey fails." into nyc-dev 

am: f4102446

* commit 'f4102446':
  Continue to remove users when destroyUserKey fails.

Change-Id: Ic3fbb44439c4b654cc2e3d5898563ef2e848dc0a
parents b3f53cb6 f4102446

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

+7 −1
Original line number Diff line number Diff line
@@ -2196,7 +2196,13 @@ public class UserManagerService extends IUserManager.Stub { 
    }



    private void removeUserState(final int userHandle) {

        try {

            mContext.getSystemService(StorageManager.class).destroyUserKey(userHandle);

        } catch (IllegalStateException e) {

            // This may be simply because the user was partially created.

            Slog.i(LOG_TAG,

                "Destroying key for user " + userHandle + " failed, continuing anyway", e);

        }

        // Cleanup package manager settings

        mPm.cleanUpUser(this, userHandle);