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

Commit 085fe8f8 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

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



Change-Id: Ie1fb61c76a0935a02850e8ccf554977831a0c08d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08614cac 22fa02c3

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

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