From b739c22a4da9428d45e0486fdc6e486f4eab76ac Mon Sep 17 00:00:00 2001 From: Shraddha Basantwani Date: Wed, 19 Aug 2020 10:55:38 +0530 Subject: [PATCH] CEC : Use system property to get the audio device name Bug: 15990136 Test: make Change-Id: I2452f5bf2b6b7c698cc82506f24f1dab61fcfc04 --- .../server/hdmi/HdmiCecLocalDeviceAudioSystem.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java index 496273b6bf0e6..f7eda45b079a7 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java @@ -635,17 +635,17 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { private byte[] getSupportedShortAudioDescriptorsFromConfig( List deviceConfig, @AudioCodec int[] audioFormatCodes) { DeviceConfig deviceConfigToUse = null; + String audioDeviceName = SystemProperties.get( + Constants.PROPERTY_SYSTEM_AUDIO_MODE_AUDIO_PORT, + "VX_AUDIO_DEVICE_IN_HDMI_ARC"); for (DeviceConfig device : deviceConfig) { - // TODO(amyjojo) use PROPERTY_SYSTEM_AUDIO_MODE_AUDIO_PORT to get the audio device name - if (device.name.equals("VX_AUDIO_DEVICE_IN_HDMI_ARC")) { + if (device.name.equals(audioDeviceName)) { deviceConfigToUse = device; break; } } 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 " - + "VX_AUDIO_DEVICE_IN_HDMI_ARC"); + Slog.w(TAG, "sadConfig.xml does not have required device info for " + audioDeviceName); return new byte[0]; } HashMap map = new HashMap<>();