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

Commit cba9873e authored by Eric Laurent's avatar Eric Laurent
Browse files

Merge commit 'fe254b6e' into manualmerge 

Change-Id: If26269b8356155a0cb4c364c971866ec3b7e4ca6
parents 4eec25af fe254b6e

media/java/android/media/AudioService.java

+4 −2
Original line number Diff line number Diff line
@@ -4734,7 +4734,8 @@ public class AudioService extends IAudioService.Stub { 
            connType = AudioRoutesInfo.MAIN_HEADPHONES;

            intent.setAction(Intent.ACTION_HEADSET_PLUG);

            intent.putExtra("microphone", 0);

        } else if (device == AudioSystem.DEVICE_OUT_HDMI) {

        } else if (device == AudioSystem.DEVICE_OUT_HDMI ||

                device == AudioSystem.DEVICE_OUT_HDMI_ARC) {

            connType = AudioRoutesInfo.MAIN_HDMI;

            configureHdmiPlugIntent(intent, state);

        }
@@ -4829,7 +4830,8 @@ public class AudioService extends IAudioService.Stub { 
                for (AudioPort port : ports) {

                    if (port instanceof AudioDevicePort) {

                        final AudioDevicePort devicePort = (AudioDevicePort) port;

                        if (devicePort.type() == AudioManager.DEVICE_OUT_HDMI) {

                        if (devicePort.type() == AudioManager.DEVICE_OUT_HDMI ||

                                devicePort.type() == AudioManager.DEVICE_OUT_HDMI_ARC) {

                            // format the list of supported encodings

                            int[] formats = devicePort.formats();

                            if (formats.length > 0) {