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

Commit 945f8836 authored by Kenny Guy's avatar Kenny Guy
Browse files

Handle users being deleted in getUserHandle. 

getUserHandle by serial number calls getUserInfoLocked
which may return null for a user that exists when its
being deleted.

Change-Id: I949831f8bc959e5ec1f3cb907d86313f10e12554
parent 92b2fe5d

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

+2 −1
Original line number Diff line number Diff line
@@ -1786,7 +1786,8 @@ public class UserManagerService extends IUserManager.Stub { 
    public int getUserHandle(int userSerialNumber) {

        synchronized (mPackagesLock) {

            for (int userId : mUserIds) {

                if (getUserInfoLocked(userId).serialNumber == userSerialNumber) return userId;

                UserInfo info = getUserInfoLocked(userId);

                if (info != null && info.serialNumber == userSerialNumber) return userId;

            }

            // Not found

            return -1;