Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb am: 8d3a8b1327

am: 1a34a41268 Change-Id: Ic3673491705af125a88f66460996911244184fc8
2017-01-19 19:10:44 +00:00
parent 61650097ed 1a34a41268
commit 70abb5122a
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -1468,7 +1468,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()