Commit 50b1bd24 authored Aug 19, 2015 by Amith Yamasani Committed by Android Git Automerger Aug 19, 2015

am a79f37c3: am 6e6fbc93: am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix...

am a79f37c3: am 6e6fbc93: am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev

* commit 'a79f37c3':
  Fix crashes when removing work profile

parents e264f9a5 a79f37c3

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -419,9 +419,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;
		}
		}