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

Commit 9deba8bd authored by Anna Bauza's avatar Anna Bauza Committed by Android (Google) Code Review
Browse files

Merge "Fix "Turn on phone calls" for guest user"

parents fc5e061c 84888b4a

proto/src/metrics_constants/metrics_constants.proto

+2 −1
Original line number Diff line number Diff line
@@ -2794,8 +2794,9 @@ message MetricsEvent { 
    // OPEN: Settings > User > Confirm remove dialog

    DIALOG_USER_REMOVE = 591;



    // DEPRECATED: Feature has been moved and dialog is no longer shown

    // OPEN: Settings > User > Enable calling dialog

    DIALOG_USER_ENABLE_CALLING = 592;

    DIALOG_USER_ENABLE_CALLING = 592 [deprecated=true];



    // OPEN: Settings > User > Enable calling and sms dialog

    DIALOG_USER_ENABLE_CALLING_AND_SMS = 593;

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

+6 −0
Original line number Diff line number Diff line
@@ -2037,6 +2037,12 @@ public class UserManagerService extends IUserManager.Stub { 
        synchronized (mGuestRestrictions) {

            mGuestRestrictions.clear();

            mGuestRestrictions.putAll(restrictions);

            UserInfo guest = findCurrentGuestUser();

            if (guest != null) {

                synchronized (mRestrictionsLock) {

                    updateUserRestrictionsInternalLR(mGuestRestrictions, guest.id);

                }

            }

        }

        synchronized (mPackagesLock) {

            writeUserListLP();