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

Commit 9c295d41 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Fix NPE when querying serial number of a partial user. 

Assuming that UserData.userInfo is never null (?) exists() check
seems unnecessary - in this case getUserInfoLU will just return
null.

Bug: 127791661
Test: build, boot
Change-Id: Ieb10dea96269a92b12bdc084116b1f7633a7c5c5
parent 4d7990f4

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

+3 −3
Original line number Diff line number Diff line
@@ -3372,15 +3372,15 @@ public class UserManagerService extends IUserManager.Stub { 
    @Override

    public int getUserSerialNumber(int userHandle) {

        synchronized (mUsersLock) {

            if (!exists(userHandle)) return -1;

            return getUserInfoLU(userHandle).serialNumber;

            final UserInfo userInfo = getUserInfoLU(userHandle);

            return userInfo != null ? userInfo.serialNumber : -1;

        }

    }



    @Override

    public boolean isUserNameSet(int userHandle) {

        synchronized (mUsersLock) {

            UserInfo userInfo = getUserInfoLU(userHandle);

            final UserInfo userInfo = getUserInfoLU(userHandle);

            return userInfo != null && userInfo.name != null;

        }

    }