Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 897d3913 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "UMS use mUsersLock to synchronized" am: 659ccfc9 am: ca2d0638 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9075ab382ff6d8cb35c9fae6a776797887332c12
parents beb4c13a ca2d0638

services/core/java/com/android/server/pm/UserManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -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);

            }

        }