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

Merge "Replace 2 synchronized blocks with one in revokeUserAdmin method"

Browse Source
This commit is contained in:
Tetiana Meronyk
2023-01-11 13:57:00 +00:00
committed by Android (Google) Code Review
parent 23922920f5 ce340b8d80
commit 15fef80e71
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -1476,20 +1476,15 @@ public class UserManagerService extends IUserManager.Stub {
@Override
public void revokeUserAdmin(@UserIdInt int userId) {
checkManageUserAndAcrossUsersFullPermission("revoke admin privileges");
synchronized (mPackagesLock) {
UserInfo info;
synchronized (mUsersLock) {
info = getUserInfoLU(userId);
}
if (info == null || !info.isAdmin()) {
// Exit if no user found with that id, or the user is not an Admin.
return;
}
info.flags ^= UserInfo.FLAG_ADMIN;
synchronized (mUsersLock) {
writeUserLP(getUserDataLU(info.id));
UserData user = getUserDataLU(userId);
if (user == null || !user.info.isAdmin()) {
// Exit if no user found with that id, or the user is not an Admin.
return;
}
user.info.flags ^= UserInfo.FLAG_ADMIN;
writeUserLP(user);
}
}
}