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

Merge "CEC : Use system property to get the audio device name" am: c3808b00b6 am: ce6a7ddc0f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404647

Change-Id: Ifa4959b2f39e6916b478b02cecf0502a1bd1436c
This commit is contained in:
Treehugger Robot
2020-11-03 21:46:43 +00:00
committed by Automerger Merge Worker
parent f3e79de96b ce6a7ddc0f
commit 02b884c96e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
View File

@@ -708,17 +708,17 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
private byte[] getSupportedShortAudioDescriptorsFromConfig( private byte[] getSupportedShortAudioDescriptorsFromConfig(
List<DeviceConfig> deviceConfig, @AudioCodec int[] audioFormatCodes) { List<DeviceConfig> deviceConfig, @AudioCodec int[] audioFormatCodes) {
DeviceConfig deviceConfigToUse = null; DeviceConfig deviceConfigToUse = null;
String audioDeviceName = SystemProperties.get(
Constants.PROPERTY_SYSTEM_AUDIO_MODE_AUDIO_PORT,
"VX_AUDIO_DEVICE_IN_HDMI_ARC");
for (DeviceConfig device : deviceConfig) { for (DeviceConfig device : deviceConfig) {
// TODO(amyjojo) use PROPERTY_SYSTEM_AUDIO_MODE_AUDIO_PORT to get the audio device name if (device.name.equals(audioDeviceName)) {
if (device.name.equals("VX_AUDIO_DEVICE_IN_HDMI_ARC")) {
deviceConfigToUse = device; deviceConfigToUse = device;
break; break;
} }
} }
if (deviceConfigToUse == null) { if (deviceConfigToUse == null) {
// TODO(amyjojo) use PROPERTY_SYSTEM_AUDIO_MODE_AUDIO_PORT to get the audio device name Slog.w(TAG, "sadConfig.xml does not have required device info for " + audioDeviceName);
Slog.w(TAG, "sadConfig.xml does not have required device info for "
+ "VX_AUDIO_DEVICE_IN_HDMI_ARC");
return new byte[0]; return new byte[0];
} }
HashMap<Integer, byte[]> map = new HashMap<>(); HashMap<Integer, byte[]> map = new HashMap<>();