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

Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb

Browse Source 
am: 8d3a8b1327

Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add
This commit is contained in:
yuanhao
2017-01-19 19:05:54 +00:00
committed by android-build-merger
parent d70e5d9317 8d3a8b1327
commit 1a34a41268
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

@@ -1443,7 +1443,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()