diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 167ad3ba7d0e3..204859920d348 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -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,