diff options
| author | Eric Laurent <elaurent@google.com> | 2015-01-12 16:29:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-12 16:29:59 +0000 |
| commit | fe254b6ed2c35f71bfc51ab103001c389e6ad9e1 (patch) | |
| tree | 00e67e065c52f162a6685e9fde6ff6ea59e48cc7 /media | |
| parent | afeefb63c60313cfe82fd8581d01c54969d2cffa (diff) | |
| parent | f67278306b7f4c48f92113a8f1c1ace39c9b62e7 (diff) | |
| download | frameworks_base-fe254b6ed2c35f71bfc51ab103001c389e6ad9e1.zip frameworks_base-fe254b6ed2c35f71bfc51ab103001c389e6ad9e1.tar.gz frameworks_base-fe254b6ed2c35f71bfc51ab103001c389e6ad9e1.tar.bz2 | |
am 695233fe: Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev
automerge: f672783
* commit 'f67278306b7f4c48f92113a8f1c1ace39c9b62e7':
AudioService: send connection intent for HDMI ARC device
Diffstat (limited to 'media')
| -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) { |