Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Settings crash due to Allow guest to use phone with guest user" into udc-qpr-dev

Browse Source
This commit is contained in:
Tetiana Meronyk
2023-06-29 10:42:43 +00:00
committed by Android (Google) Code Review
parent 927fe331e9 72d6a6fb02
commit 22fa02c36f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -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) {