Merge "UMS use mUsersLock to synchronized"
This commit is contained in:
@@ -3724,7 +3724,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;
|
||||
@@ -3732,7 +3732,7 @@ public class UserManagerService extends IUserManager.Stub {
|
||||
|
||||
@VisibleForTesting
|
||||
void removeUserInfo(@UserIdInt int userId) {
|
||||
synchronized (mUsers) {
|
||||
synchronized (mUsersLock) {
|
||||
mUsers.remove(userId);
|
||||
}
|
||||
}
|
||||
@@ -4052,7 +4052,7 @@ public class UserManagerService extends IUserManager.Stub {
|
||||
userFile.delete();
|
||||
updateUserIds();
|
||||
if (RELEASE_DELETED_USER_ID) {
|
||||
synchronized (mUsers) {
|
||||
synchronized (mUsersLock) {
|
||||
mRemovingUserIds.delete(userId);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user