diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index f85b1957e33f..07584b3c9be5 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -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; |