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

Commit 38f25943 authored by Anna Bauza's avatar Anna Bauza Committed by Automerger Merge Worker
Browse files

Merge "Fix settings crash by removing potential deadlock in... 

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

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



Change-Id: I5dc0a51c314df4bf93ff03f15c890aa06a7cc642
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03c53712 36680dc6

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

+6 −6
Original line number Diff line number Diff line
@@ -2650,15 +2650,15 @@ public class UserManagerService extends IUserManager.Stub { 
    @Override

    public void setDefaultGuestRestrictions(Bundle restrictions) {

        checkManageUsersPermission("setDefaultGuestRestrictions");

        synchronized (mGuestRestrictions) {

            mGuestRestrictions.clear();

            mGuestRestrictions.putAll(restrictions);

        final List<UserInfo> guests = getGuestUsers();

            for (int i = 0; i < guests.size(); i++) {

        synchronized (mRestrictionsLock) {

                    updateUserRestrictionsInternalLR(mGuestRestrictions, guests.get(i).id);

            for (int i = 0; i < guests.size(); i++) {

                updateUserRestrictionsInternalLR(restrictions, guests.get(i).id);

            }

        }

        synchronized (mGuestRestrictions) {

            mGuestRestrictions.clear();

            mGuestRestrictions.putAll(restrictions);

        }

        synchronized (mPackagesLock) {

            writeUserListLP();