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

Commit fe254b6e authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

am 695233fe: Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev 

automerge: f6727830

* commit 'f6727830':
  AudioService: send connection intent for HDMI ARC device
parents afeefb63 f6727830

media/java/android/media/AudioService.java

+4 −2
Original line number Diff line number Diff line
@@ -4740,7 +4740,8 @@ public class AudioService extends IAudioService.Stub { 
        } else if (device == AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET) {

            connType = AudioRoutesInfo.MAIN_DOCK_SPEAKERS;

            intent.setAction(AudioManager.ACTION_DIGITAL_AUDIO_DOCK_PLUG);

        } 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);

        }
@@ -4835,7 +4836,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) {