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

Commit 4808f20c 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 am: 1eca3d73 am: 2c31fa42 

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

Change-Id: I16a0a0f4731221df786a17311e713f71a2a0bd9f
parents 50923506 2c31fa42

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

+3 −1
Original line number Diff line number Diff line
@@ -713,7 +713,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);

            }