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

Commit a91f64d4 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Automerger Merge Worker
Browse files

Merge "Fix Settings crash due to Allow guest to use phone with guest user"... 

Merge "Fix Settings crash due to Allow guest to use phone with guest user" into udc-qpr-dev am: 22fa02c3 am: 085fe8f8

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



Change-Id: I7e7c3658a466f662b5e28d6c542e0a330b638315
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33f058a8 085fe8f8

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

+2 −2
Original line number Diff line number Diff line
@@ -2987,14 +2987,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) {