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

Commit d12455da authored by Pavel Grafov's avatar Pavel Grafov Committed by android-build-merger
Browse files

Merge "Move key eviction past system services user cleanup." into oc-mr1-dev 

am: 03515d0a

Change-Id: I206f33be06a993bcaef2fc68aa2c83bef80e6488
parents de7f07a5 03515d0a

services/core/java/com/android/server/am/UserController.java

+6 −6
Original line number Diff line number Diff line
@@ -671,12 +671,6 @@ final class UserController { 
        }



        if (stopped) {

            // Evict the user's credential encryption key

            try {

                getStorageManager().lockUserKey(userId);

            } catch (RemoteException re) {

                throw re.rethrowAsRuntimeException();

            }

            mInjector.systemServiceManagerCleanupUser(userId);

            synchronized (mLock) {

                mInjector.getActivityStackSupervisor().removeUserLocked(userId);
@@ -685,6 +679,12 @@ final class UserController { 
            if (getUserInfo(userId).isEphemeral()) {

                mInjector.getUserManager().removeUser(userId);

            }

            // Evict the user's credential encryption key.

            try {

                getStorageManager().lockUserKey(userId);

            } catch (RemoteException re) {

                throw re.rethrowAsRuntimeException();

            }

        }

    }