Merge "Fix deadlock in removing a user" into jb-mr1-dev (2c1dfa29) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -530,6 +530,10 @@ public class UserManagerService extends IUserManager.Stub {
		synchronized (mUsers) {
		result = removeUserLocked(userHandle);
		}

		// Cleanup package manager settings
		mPm.cleanUpUser(userHandle);

		// Let other services shutdown any activity
		Intent addedIntent = new Intent(Intent.ACTION_USER_REMOVED);
		addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userHandle);
		@@ -562,8 +566,6 @@ public class UserManagerService extends IUserManager.Stub {
		return false;
		}

		mPm.cleanUpUser(userHandle);

		// Remove this user from the list
		mUsers.remove(userHandle);
		// Remove user file