diff options
| author | 2022-01-10 22:17:41 +0000 | |
|---|---|---|
| committer | 2022-01-10 22:17:41 +0000 | |
| commit | 7bbe23a50271d43281545497744488ece5413411 (patch) | |
| tree | ff66d4f72ec718d409e61ef57182d21c24b06251 | |
| parent | 00cace4e96e1e3beed98900bc1e805f710d75d32 (diff) | |
| parent | 73f117362c9c0407b2ca921417c9e9fe7a51fc95 (diff) | |
Merge "Merge "arc: Do not construct RestrictionSet with empty restrictions bundle" am: c386a39a95 am: 467d5d36d1 am: 1556cd3c02 am: f099b1b6c1"
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 167ad3ba7d0e..204859920d34 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, |