Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb

am: 8d3a8b1327 Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add
2017-01-19 19:05:54 +00:00
parent d70e5d9317 8d3a8b1327
commit 1a34a41268
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
@@ -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()