diff options
| author | 2023-06-16 12:59:05 +0000 | |
|---|---|---|
| committer | 2023-06-28 11:55:33 +0000 | |
| commit | 72d6a6fb02401c502a9fb522146a5dd17edfe03c (patch) | |
| tree | 5d7eaaace123eb9831c306bf1323eb1f009cde56 | |
| parent | 0976919ceb14d6f5496be9f0c7ce1ef457094834 (diff) | |
Fix Settings crash due to Allow guest to use phone with guest user
Bug: 268598431
Test: atest UserManagerServiceTest
Change-Id: I7727b448b4b2cc84e896bfe8b71b6aaf233cb63d
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 4 |
1 files changed, 2 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 7e88e13e1788..abc3052c965e 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -2927,14 +2927,14 @@ public class UserManagerService extends IUserManager.Stub { Preconditions.checkState(mCachedEffectiveUserRestrictions.getRestrictions(userId) != newBaseRestrictions); - if (mBaseUserRestrictions.updateRestrictions(userId, newBaseRestrictions)) { + if (mBaseUserRestrictions.updateRestrictions(userId, new Bundle(newBaseRestrictions))) { scheduleWriteUser(userId); } } final Bundle effective = computeEffectiveUserRestrictionsLR(userId); - mCachedEffectiveUserRestrictions.updateRestrictions(userId, effective); + mCachedEffectiveUserRestrictions.updateRestrictions(userId, new Bundle(effective)); // Apply the new restrictions. if (DBG) { |