Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1a34a41268

Change-Id: Ic3673491705af125a88f66460996911244184fc8
This commit is contained in:
yuanhao
2017-01-19 19:10:44 +00:00
committed by android-build-merger
parent 61650097ed 1a34a41268
commit 70abb5122a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -1468,7 +1468,7 @@ public class UserManagerService extends IUserManager.Stub {
} }
synchronized(mUsersLock) { synchronized(mUsersLock) {
UserInfo userInfo = getUserInfoLU(userId); UserInfo userInfo = getUserInfoLU(userId);
if (!userInfo.canHaveProfile()) { if (userInfo == null || !userInfo.canHaveProfile()) {
return false; return false;
} }
int usersCountAfterRemoving = getAliveUsersExcludingGuestsCountLU() int usersCountAfterRemoving = getAliveUsersExcludingGuestsCountLU()