commit | a83222e4fbdc5eef936eb3834cbf02be05bfc19c | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 19 18:53:24 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jan 19 18:53:25 2017 +0000 |
tree | c0db162e1707bcf6128da3a3fb9971d51476d0de | |
parent | 3a7253a09d1223796bd41b2a6308ace92c504ca2 [diff] | |
parent | 47f9f7cbcb4213a8baa4fd9e52162abde46721de [diff] |
Merge "Fixed NPE in canAddMoreManagedProfiles"
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 0a385f3..e59244d 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 @@ } synchronized(mUsersLock) { UserInfo userInfo = getUserInfoLU(userId); - if (!userInfo.canHaveProfile()) { + if (userInfo == null || !userInfo.canHaveProfile()) { return false; } int usersCountAfterRemoving = getAliveUsersExcludingGuestsCountLU()