Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce6a7ddc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I83195c8568e8ef9d3568d8e8b8a5372aa210162d
parents ee28787c c3808b00

services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java

+5 −5
Original line number Diff line number Diff line
@@ -708,17 +708,17 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
    private byte[] getSupportedShortAudioDescriptorsFromConfig(

            List<DeviceConfig> 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<Integer, byte[]> map = new HashMap<>();