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

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

Merge "Disable ARC when physical address is incorrect" am: 27cdbf8a 

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

Change-Id: I31d0f6f615257269af213477fcb2ef37f2800727
parents 20deed1e 27cdbf8a

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

+3 −1
Original line number Diff line number Diff line
@@ -800,7 +800,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        assertRunOnServiceThread();

        if (!mService.isPowerStandbyOrTransient()) {

            addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress()));

            if (isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId())

            if (!isDirectConnectAddress(avr.getPhysicalAddress())) {

                startArcAction(false);

            } else if (isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId())

                    && !hasAction(SetArcTransmissionStateAction.class)) {

                startArcAction(true);

            }