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

Commit 283f6da2 authored by Paul Colta's avatar Paul Colta Committed by Android (Google) Code Review
Browse files

Merge "HDMI: On TV panels if DSM is enabled do not allocate an audio system" into main

parents 50d2f4d1 5fc1f1a9

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

+2 −1
Original line number Diff line number Diff line
@@ -1380,7 +1380,8 @@ public class HdmiControlService extends SystemService { 
    @ServiceThreadOnly

    private List<Integer> getCecLocalDeviceTypes() {

        ArrayList<Integer> allLocalDeviceTypes = new ArrayList<>(mCecLocalDevices);

        if (isDsmEnabled() && !allLocalDeviceTypes.contains(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM)

        if (!isTvDevice() && isDsmEnabled()

                && !allLocalDeviceTypes.contains(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM)

                && isArcSupported() && mSoundbarModeFeatureFlagEnabled) {

            allLocalDeviceTypes.add(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);

        }