diff options
| author | 2017-01-19 19:05:54 +0000 | |
|---|---|---|
| committer | 2017-01-19 19:05:54 +0000 | |
| commit | 1a34a412688dbb5489a20c942a6bfa5996bf1e77 (patch) | |
| tree | 6c21950ebe54ca66f7ba1c6d31e86e163256876e | |
| parent | d70e5d93171e0b771b1d4b2ceff26084a5797e4e (diff) | |
| parent | 8d3a8b13272fff1757ad793a748816119b21dcea (diff) | |
Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb
am: 8d3a8b1327
Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
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() |