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

Commit 22fa02c3 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

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

parents 927fe331 72d6a6fb

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