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

Commit 73f11736 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "arc: Do not construct RestrictionSet with empty restrictions bundle"... 

Merge "arc: Do not construct RestrictionSet with empty restrictions bundle" am: c386a39a am: 467d5d36 am: 1556cd3c am: f099b1b6

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

Change-Id: I7b258ac62a71214d5ed21ff06b976cf914d30c9a
parents 3b8a0bc6 f099b1b6

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

+5 −2
Original line number Diff line number Diff line
@@ -3537,8 +3537,11 @@ public class UserManagerService extends IUserManager.Stub { 
                    Slog.wtf(LOG_TAG, "Seeing both legacy and current local restrictions in xml");

                }

            } else if (legacyLocalRestrictions != null) {

                mDevicePolicyLocalUserRestrictions.put(id,

                        new RestrictionsSet(id, legacyLocalRestrictions));

                RestrictionsSet legacyLocalRestrictionsSet =

                        legacyLocalRestrictions.isEmpty()

                                ? new RestrictionsSet()

                                : new RestrictionsSet(id, legacyLocalRestrictions);

                mDevicePolicyLocalUserRestrictions.put(id, legacyLocalRestrictionsSet);

            }

            if (globalRestrictions != null) {

                mDevicePolicyGlobalUserRestrictions.updateRestrictions(id,