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

Commit 2b9edaea authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "setWiredDeviceConnectionState requires MODIFY_AUDIO_ROUTING" into... 

Merge "setWiredDeviceConnectionState requires MODIFY_AUDIO_ROUTING" into rvc-dev am: 5523d8ee am: ad5b5b54 am: 7f036d0f am: 6438a3ab

Change-Id: I91a57a00959833d8021a119da5dfac08ae3bfd9e
parents 4fc16a18 6438a3ab

media/java/android/media/AudioManager.java

+1 −0
Original line number Diff line number Diff line
@@ -4579,6 +4579,7 @@ public class AudioManager { 
     * {@hide}

     */

    @UnsupportedAppUsage

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

    public void setWiredDeviceConnectionState(int type, int state, String address, String name) {

        final IAudioService service = getService();

        try {

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

+1 −0
Original line number Diff line number Diff line
@@ -4722,6 +4722,7 @@ public class AudioService extends IAudioService.Stub 
    public void setWiredDeviceConnectionState(int type,

            @ConnectionState int state, String address, String name,

            String caller) {

        enforceModifyAudioRoutingPermission();

        if (state != CONNECTION_STATE_CONNECTED

                && state != CONNECTION_STATE_DISCONNECTED) {

            throw new IllegalArgumentException("Invalid state " + state);