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

Commit 757ed290 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING" into... 

Merge "AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING" into qt-qpr1-dev am: a2bfc8ce

Change-Id: I199f8957c0df1d3efeb85cbe8e561e31045ee409
parents ad4458c2 a2bfc8ce

media/java/android/media/AudioManager.java

+1 −0
Original line number Diff line number Diff line
@@ -908,6 +908,7 @@ public class AudioManager { 


    /** @hide */

    @UnsupportedAppUsage

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

    public void setMasterMute(boolean mute, int flags) {

        final IAudioService service = getService();

        try {

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

+1 −0
Original line number Diff line number Diff line
@@ -2814,6 +2814,7 @@ public class AudioService extends IAudioService.Stub 
    }



    public void setMasterMute(boolean mute, int flags, String callingPackage, int userId) {

        enforceModifyAudioRoutingPermission();

        setMasterMuteInternal(mute, flags, callingPackage, Binder.getCallingUid(),

                userId);

    }