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

Merge "Fix NPE when querying serial number of a partial user."

Browse Source
This commit is contained in:
Pavel Grafov
2019-03-27 11:10:38 +00:00
committed by Android (Google) Code Review
parent d50bec92f5 9c295d41d3
commit fdafee5024
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;
}
}