diff options
| author | Kenny Guy <kennyguy@google.com> | 2014-06-13 13:51:42 +0100 |
|---|---|---|
| committer | Kenny Guy <kennyguy@google.com> | 2014-06-13 14:10:29 +0100 |
| commit | 17c9d69d7018c62d9d08ceecc6218df6704832dd (patch) | |
| tree | b22a760ebfb57848b0f33c0ceeb86fc59532adbc | |
| parent | 6dfa6e2a9be08a3a0f152a7b772efc8ce2469bce (diff) | |
| download | frameworks_base-17c9d69d7018c62d9d08ceecc6218df6704832dd.zip frameworks_base-17c9d69d7018c62d9d08ceecc6218df6704832dd.tar.gz frameworks_base-17c9d69d7018c62d9d08ceecc6218df6704832dd.tar.bz2 | |
Don't remove a user already being removed.
Check if UserManager is already removing
a user before starting to remove it.
Bug: 15583858
Change-Id: If9763e9b47355d9ae35cc621367c74725029aa90
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 0cb2ab9..b941657 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -1104,7 +1104,7 @@ public class UserManagerService extends IUserManager.Stub { final UserInfo user; synchronized (mPackagesLock) { user = mUsers.get(userHandle); - if (userHandle == 0 || user == null) { + if (userHandle == 0 || user == null || mRemovingUserIds.get(userHandle)) { return false; } mRemovingUserIds.put(userHandle, true); |