Merge "Handle users being deleted in getUserHandle." (c6274846) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1787,7 +1787,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;