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

am: 70abb5122a Change-Id: I806e4ce4f01e28c3b7e413b6447154a3cf77aca5
2017-01-19 19:14:52 +00:00
parent f45badefbb 70abb5122a
commit 823fe8481e
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
@@ -1567,7 +1567,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()