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

Commit d5c6dffa authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Change checking rule in startArcAction(false) for HDMI CTS" am: 3adddd63 am: 10d8d710 

Change-Id: Ic503411c200d2c740a21e388372cb16b99e5141f
parents 2e73fa46 10d8d710

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;

            }