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

Commit 8d115da9 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Remove the pending ARC termination Action when boot up and init ARC... 

Merge "Remove the pending ARC termination Action when boot up and init ARC regardless of the current ARC status."
parents 2c367550 f05bbe18

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

+2 −2
Original line number Diff line number Diff line
@@ -922,8 +922,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        // Since some TVs don't request ARC on with System Audio Mode on request

        if (SystemProperties.getBoolean(Constants.PROPERTY_ARC_SUPPORT, true)

                && isDirectConnectToTv()) {

            if (newSystemAudioMode && !isArcEnabled()

                    && !hasAction(ArcInitiationActionFromAvr.class)) {

            if (!hasAction(ArcInitiationActionFromAvr.class)) {

                addAndStartAction(new ArcInitiationActionFromAvr(this));

            }

        }
@@ -1097,6 +1096,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
    }



    private void initArcOnFromAvr() {

        removeAction(ArcTerminationActionFromAvr.class);

        if (SystemProperties.getBoolean(Constants.PROPERTY_ARC_SUPPORT, true)

                && isDirectConnectToTv() && !isArcEnabled()) {

            removeAction(ArcInitiationActionFromAvr.class);