Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix deadlock in removing a user" into jb-mr1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-08-22 18:19:19 -07:00
committed by Android (Google) Code Review
parent 3451dc9064 0cd867c83e
commit 2c1dfa29b4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/pm/UserManagerService.java
View File

@@ -530,6 +530,10 @@ public class UserManagerService extends IUserManager.Stub {
synchronized (mUsers) { synchronized (mUsers) {
result = removeUserLocked(userHandle); result = removeUserLocked(userHandle);
} }
// Cleanup package manager settings
mPm.cleanUpUser(userHandle);
// Let other services shutdown any activity // Let other services shutdown any activity
Intent addedIntent = new Intent(Intent.ACTION_USER_REMOVED); Intent addedIntent = new Intent(Intent.ACTION_USER_REMOVED);
addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userHandle); addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userHandle);
@@ -562,8 +566,6 @@ public class UserManagerService extends IUserManager.Stub {
return false; return false;
} }
mPm.cleanUpUser(userHandle);
// Remove this user from the list // Remove this user from the list
mUsers.remove(userHandle); mUsers.remove(userHandle);
// Remove user file // Remove user file