diff options
| author | Eric Laurent <elaurent@google.com> | 2015-01-09 15:09:40 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2015-01-09 15:09:40 -0800 |
| commit | 6fa4245589c93025d91aab7dc6681babdd91ee41 (patch) | |
| tree | 9166b65ecc00e5cdd3b9a670dbaf7540e8326ab0 /media/java | |
| parent | 2610d71251e3e376e2514f20986c81e5d55f1b55 (diff) | |
| download | frameworks_base-6fa4245589c93025d91aab7dc6681babdd91ee41.zip frameworks_base-6fa4245589c93025d91aab7dc6681babdd91ee41.tar.gz frameworks_base-6fa4245589c93025d91aab7dc6681babdd91ee41.tar.bz2 | |
AudioService: send connection intent for HDMI ARC device
Bug: 18921279.
Change-Id: I1e23b5aed7a2835feb0fea2a412f3622c01cbe55
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index f8688da..5b6ca29 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -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) { |