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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9075ab382ff6d8cb35c9fae6a776797887332c12
This commit is contained in:
Treehugger Robot
2021-01-06 21:43:31 +00:00
committed by Automerger Merge Worker
parent beb4c13a4d ca2d0638ab
commit 897d3913fe
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

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