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

Commit 33170b2a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

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

Change-Id: I6b43ba15eb2c4d0df116c3db55441b6edcd55d35
parents a6d94484 997d3b5e

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;

            }