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

Commit 3adddd63 authored by Austin Shin's avatar Austin Shin Committed by Gerrit Code Review
Browse files

Merge "Change checking rule in startArcAction(false) for HDMI CTS"

parents b4562568 5cc9ac99

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

+4 −3
Original line number Diff line number Diff line
@@ -1092,10 +1092,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        HdmiDeviceInfo avr = getAvrDeviceInfo();

        if (avr != null

                && (avrAddress == avr.getLogicalAddress())

                && isConnectedToArcPort(avr.getPhysicalAddress())

                && isDirectConnectAddress(avr.getPhysicalAddress())) {

                && isConnectedToArcPort(avr.getPhysicalAddress())) {

            if (enabled) {

                return isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId());

                return isConnected(avr.getPortId())

                    && isArcFeatureEnabled(avr.getPortId())

                    && isDirectConnectAddress(avr.getPhysicalAddress());

            } else {

                return true;

            }