diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-08-19 20:19:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 20:19:28 +0000 |
| commit | e1df482c173d975923dba2d3cf644f5a0fadee17 (patch) | |
| tree | b7c913cddcbb2898682aa14dc5652b4f82f76217 | |
| parent | 5c577bab3b4cd9bf74a09368be5d73aed627f6a5 (diff) | |
| parent | e3de6c5df5a94e627c5ee0f188cbb066233a3dd0 (diff) | |
| download | frameworks_base-e1df482c173d975923dba2d3cf644f5a0fadee17.zip frameworks_base-e1df482c173d975923dba2d3cf644f5a0fadee17.tar.gz frameworks_base-e1df482c173d975923dba2d3cf644f5a0fadee17.tar.bz2 | |
am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev
* commit 'e3de6c5df5a94e627c5ee0f188cbb066233a3dd0':
Fix crashes when removing work profile
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 3 |
1 files changed, 2 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 ca9d1ef..06c3682 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -403,9 +403,10 @@ public class UserManagerService extends IUserManager.Stub { return ui; } + /** Called by PackageManagerService */ public boolean exists(int userId) { synchronized (mPackagesLock) { - return ArrayUtils.contains(mUserIds, userId); + return mUsers.get(userId) != null; } } |