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

Commit 72d6a6fb authored by Tetiana Meronyk's avatar Tetiana Meronyk
Browse files

Fix Settings crash due to Allow guest to use phone with guest user 

Bug: 268598431
Test: atest UserManagerServiceTest
Change-Id: I7727b448b4b2cc84e896bfe8b71b6aaf233cb63d
parent 0976919c

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