Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Laurent
2015-01-12 15:39:43 +00:00
committed by Android (Google) Code Review
parent d74a331ae1 6fa4245589
commit 695233fe83
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/AudioService.java
View File

@@ -4740,7 +4740,8 @@ public class AudioService extends IAudioService.Stub {
} else if (device == AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET) { } else if (device == AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET) {
connType = AudioRoutesInfo.MAIN_DOCK_SPEAKERS; connType = AudioRoutesInfo.MAIN_DOCK_SPEAKERS;
intent.setAction(AudioManager.ACTION_DIGITAL_AUDIO_DOCK_PLUG); 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; connType = AudioRoutesInfo.MAIN_HDMI;
configureHdmiPlugIntent(intent, state); configureHdmiPlugIntent(intent, state);
} }
@@ -4835,7 +4836,8 @@ public class AudioService extends IAudioService.Stub {
for (AudioPort port : ports) { for (AudioPort port : ports) {
if (port instanceof AudioDevicePort) { if (port instanceof AudioDevicePort) {
final AudioDevicePort devicePort = (AudioDevicePort) port; 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 // format the list of supported encodings
int[] formats = devicePort.formats(); int[] formats = devicePort.formats();
if (formats.length > 0) { if (formats.length > 0) {