HDMI plug intent and associated information
Read HDMI device information from audio ports and add it as
extras in the connection intent.
Document the new extras in the connection intent.
Make Intent.ACTION_HDMI_AUDIO_PLUG public.
Bug 10549017
Change-Id: I6236b5363f00c433e443195fae8c43af2fc834f7
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index fb7f0c6..c6489a6 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -4389,7 +4389,7 @@
intent.setAction(Intent.ACTION_DIGITAL_AUDIO_DOCK_PLUG);
} else if (device == AudioSystem.DEVICE_OUT_HDMI) {
connType = AudioRoutesInfo.MAIN_HDMI;
- intent.setAction(Intent.ACTION_HDMI_AUDIO_PLUG);
+ configureHdmiPlugIntent(intent, state);
}
synchronized (mCurAudioRoutes) {
@@ -4471,6 +4471,49 @@
}
}
+ private void configureHdmiPlugIntent(Intent intent, int state) {
+ intent.setAction(Intent.ACTION_HDMI_AUDIO_PLUG);
+ if (state == 1) {
+ ArrayList<AudioPort> ports = new ArrayList<AudioPort>();
+ int[] portGeneration = new int[1];
+ int status = AudioSystem.listAudioPorts(ports, portGeneration);
+ if (status == AudioManager.SUCCESS) {
+ for (AudioPort port : ports) {
+ if (port instanceof AudioDevicePort) {
+ final AudioDevicePort devicePort = (AudioDevicePort) port;
+ if (devicePort.type() == AudioManager.DEVICE_OUT_HDMI) {
+ // format the list of supported encodings
+ int[] formats = devicePort.formats();
+ if (formats.length > 0) {
+ ArrayList<Integer> encodingList = new ArrayList(1);
+ for (int format : formats) {
+ // a format in the list can be 0, skip it
+ if (format != AudioFormat.ENCODING_INVALID) {
+ encodingList.add(format);
+ }
+ }
+ int[] encodingArray = new int[encodingList.size()];
+ for (int i = 0 ; i < encodingArray.length ; i++) {
+ encodingArray[i] = encodingList.get(i);
+ }
+ intent.putExtra("encodings", encodingArray);
+ }
+ // find the maximum supported number of channels
+ int maxChannels = 0;
+ for (int mask : devicePort.channelMasks()) {
+ int channelCount = AudioFormat.channelCountFromOutChannelMask(mask);
+ if (channelCount > maxChannels) {
+ maxChannels = channelCount;
+ }
+ }
+ intent.putExtra("maxChannelCount", maxChannels);
+ }
+ }
+ }
+ }
+ }
+ }
+
/* cache of the address of the last dock the device was connected to */
private String mDockAddress;