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

Merge "Fix settings crash by removing potential deadlock in setDefaultGuestRestrictions" into udc-qpr-dev

Browse Source
This commit is contained in:
Anna Bauza
2023-07-26 07:36:02 +00:00
committed by Android (Google) Code Review
parent 1139a889d5 1004e773f6
commit 36680dc631
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2650,15 +2650,15 @@ public class UserManagerService extends IUserManager.Stub {
@Override @Override
public void setDefaultGuestRestrictions(Bundle restrictions) { public void setDefaultGuestRestrictions(Bundle restrictions) {
checkManageUsersPermission("setDefaultGuestRestrictions"); checkManageUsersPermission("setDefaultGuestRestrictions");
final List<UserInfo> guests = getGuestUsers();
synchronized (mRestrictionsLock) {
for (int i = 0; i < guests.size(); i++) {
updateUserRestrictionsInternalLR(restrictions, guests.get(i).id);
}
}
synchronized (mGuestRestrictions) { synchronized (mGuestRestrictions) {
mGuestRestrictions.clear(); mGuestRestrictions.clear();
mGuestRestrictions.putAll(restrictions); mGuestRestrictions.putAll(restrictions);
final List<UserInfo> guests = getGuestUsers();
for (int i = 0; i < guests.size(); i++) {
synchronized (mRestrictionsLock) {
updateUserRestrictionsInternalLR(mGuestRestrictions, guests.get(i).id);
}
}
} }
synchronized (mPackagesLock) { synchronized (mPackagesLock) {
writeUserListLP(); writeUserListLP();