From 47f9f7cbcb4213a8baa4fd9e52162abde46721de Mon Sep 17 00:00:00 2001 From: yuanhao Date: Wed, 18 Jan 2017 09:54:45 +0800 Subject: Fixed NPE in canAddMoreManagedProfiles We can use the command 'adb shell pm create-user --profileOf -10000 --managed TestProfile_12345678' to reproduce the problem. Signed-off-by: yuanhao --- services/core/java/com/android/server/pm/UserManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 0a385f3329fa..e59244dc7708 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -1443,7 +1443,7 @@ public class UserManagerService extends IUserManager.Stub { } synchronized(mUsersLock) { UserInfo userInfo = getUserInfoLU(userId); - if (!userInfo.canHaveProfile()) { + if (userInfo == null || !userInfo.canHaveProfile()) { return false; } int usersCountAfterRemoving = getAliveUsersExcludingGuestsCountLU() -- cgit v1.2.3-59-g8ed1b