Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a34a412 authored by yuanhao's avatar yuanhao Committed by android-build-merger
Browse files

Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4 

am: 8d3a8b13

Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add
parents d70e5d93 8d3a8b13

services/core/java/com/android/server/pm/UserManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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()