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

Commit d249e089 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Clear mGuestRestrictions before loading from disk"

parents 6b9b130c eafee02f

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

+2 −2
Original line number Diff line number Diff line
@@ -1810,8 +1810,8 @@ public class UserManagerService extends IUserManager.Stub { 
                            if (type == XmlPullParser.START_TAG) {

                                if (parser.getName().equals(TAG_RESTRICTIONS)) {

                                    synchronized (mGuestRestrictions) {

                                        mGuestRestrictions.putAll(

                                                UserRestrictionsUtils.readRestrictions(parser));

                                        UserRestrictionsUtils

                                                .readRestrictions(parser, mGuestRestrictions);

                                    }

                                }

                                break;

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

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ public class UserRestrictionsUtils { 
    }



    public static void readRestrictions(XmlPullParser parser, Bundle restrictions) {

        restrictions.clear();

        for (String key : USER_RESTRICTIONS) {

            final String value = parser.getAttributeValue(null, key);

            if (value != null) {