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

Merge "UMS use mUsersLock to synchronized" am: 659ccfc928 am: ca2d0638ab am: 897d3913fe

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99e976f1212b0226c43f39c6ccd30509c174bc33
This commit is contained in:
Treehugger Robot
2021-01-06 22:06:49 +00:00
committed by Automerger Merge Worker
parent 7b4bbc614c 897d3913fe
commit efff97ace1
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

@@ -3728,7 +3728,7 @@ public class UserManagerService extends IUserManager.Stub {
UserData putUserInfo(UserInfo userInfo) {
final UserData userData = new UserData();
userData.info = userInfo;
synchronized (mUsers) {
synchronized (mUsersLock) {
mUsers.put(userInfo.id, userData);
}
return userData;
@@ -3736,7 +3736,7 @@ public class UserManagerService extends IUserManager.Stub {
@VisibleForTesting
void removeUserInfo(@UserIdInt int userId) {
synchronized (mUsers) {
synchronized (mUsersLock) {
mUsers.remove(userId);
}
}
@@ -4140,7 +4140,7 @@ public class UserManagerService extends IUserManager.Stub {
userFile.delete();
updateUserIds();
if (RELEASE_DELETED_USER_ID) {
synchronized (mUsers) {
synchronized (mUsersLock) {
mRemovingUserIds.delete(userId);
}
}