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

Commit 33a119c9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix typo on DISALLOW_UNMUTE_DEVICE"

parents 60bcd248 492b4724

core/java/android/os/UserManager.java

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ public class UserManager { 
     * @see #getUserRestrictions()

     * @hide

     */

    public static final String DISALLLOW_UNMUTE_DEVICE = "disallow_unmute_device";

    public static final String DISALLOW_UNMUTE_DEVICE = "disallow_unmute_device";



    /**

     * Specifies if a user is not allowed to use cellular data when roaming. This can only be set by

services/core/java/com/android/server/audio/AudioService.java

+3 −3
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ public class AudioService extends IAudioService.Stub 
        // Check the current user restriction.

        boolean masterMute =

                mUserManagerInternal.getUserRestriction(currentUser,

                        UserManager.DISALLLOW_UNMUTE_DEVICE)

                        UserManager.DISALLOW_UNMUTE_DEVICE)

                        || mUserManagerInternal.getUserRestriction(currentUser,

                        UserManager.DISALLOW_ADJUST_VOLUME);

        if (mUseFixedVolume) {
@@ -5486,10 +5486,10 @@ public class AudioService extends IAudioService.Stub 
            {

                final boolean wasRestricted =

                        prevRestrictions.getBoolean(UserManager.DISALLOW_ADJUST_VOLUME)

                                || prevRestrictions.getBoolean(UserManager.DISALLLOW_UNMUTE_DEVICE);

                                || prevRestrictions.getBoolean(UserManager.DISALLOW_UNMUTE_DEVICE);

                final boolean isRestricted =

                        newRestrictions.getBoolean(UserManager.DISALLOW_ADJUST_VOLUME)

                                || newRestrictions.getBoolean(UserManager.DISALLLOW_UNMUTE_DEVICE);

                                || newRestrictions.getBoolean(UserManager.DISALLOW_UNMUTE_DEVICE);

                if (wasRestricted != isRestricted) {

                    setMasterMuteInternalNoCallerCheck(isRestricted, /* flags =*/ 0, userId);

                }

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

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_SET_USER_ICON,

            UserManager.DISALLOW_SET_WALLPAPER,

            UserManager.DISALLOW_OEM_UNLOCK,

            UserManager.DISALLLOW_UNMUTE_DEVICE,

            UserManager.DISALLOW_UNMUTE_DEVICE,

    });



    /**
@@ -156,7 +156,7 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_ADJUST_VOLUME,

            UserManager.DISALLOW_RUN_IN_BACKGROUND,

            UserManager.DISALLOW_UNMUTE_MICROPHONE,

            UserManager.DISALLLOW_UNMUTE_DEVICE

            UserManager.DISALLOW_UNMUTE_DEVICE

    );



    /**

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -8741,7 +8741,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        Preconditions.checkNotNull(who, "ComponentName is null");

        synchronized (this) {

            getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);

            setUserRestriction(who, UserManager.DISALLLOW_UNMUTE_DEVICE, on);

            setUserRestriction(who, UserManager.DISALLOW_UNMUTE_DEVICE, on);

        }

    }