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

Commit 558325ca 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 

am: d12455da

Change-Id: Ic3db718fc5f25bda2e67e6da3f64ea8a1b691901
parents 9008a83b d12455da

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

+6 −6
Original line number Diff line number Diff line
@@ -669,12 +669,6 @@ 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);
@@ -683,6 +677,12 @@ 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();

            }

        }

    }