Merge "Move key eviction past system services user cleanup." into oc-mr1-dev (03515d0a) · Commits · e / os / android_frameworks_base

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