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

Commit 467d5d36 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" am: c386a39a 

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

Change-Id: Ic3563cc3341d687b0cff8bebf67fccd51bb5a96d
parents e2d1f7e0 c386a39a

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

+5 −2
Original line number Diff line number Diff line
@@ -3402,8 +3402,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,