Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when querying serial number of a partial user.

Browse Source 
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
This commit is contained in:
Pavel Grafov
2019-03-26 19:42:08 +00:00
parent 4d7990f458
commit 9c295d41d3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -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;
}
}