Merge "Fix deadlock in removing a user" into jb-mr1-dev
diff --git a/services/java/com/android/server/pm/UserManagerService.java b/services/java/com/android/server/pm/UserManagerService.java
index f5b4053..6a76c5d 100644
--- a/services/java/com/android/server/pm/UserManagerService.java
+++ b/services/java/com/android/server/pm/UserManagerService.java
@@ -530,6 +530,10 @@
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 @@
return false;
}
- mPm.cleanUpUser(userHandle);
-
// Remove this user from the list
mUsers.remove(userHandle);
// Remove user file