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

Commit 89e7e85f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix TV didn't initiate ARC sometimes."

parents 5f2ee40e a78d019d

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

+3 −2
Original line number Diff line number Diff line
@@ -1569,10 +1569,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        // When the device is not unplugged but reawaken from standby, we check if the System

        // Audio Control Feature is enabled or not then decide if turning SAM on/off accordingly.

        if (getAvrDeviceInfo() != null && portId == getAvrDeviceInfo().getPortId()) {

            HdmiLogger.debug("Port ID:%d, 5v=%b", portId, connected);

            if (!connected) {

                setSystemAudioMode(false);

            } else if (mSystemAudioControlFeatureEnabled != mService.isSystemAudioActivated()){

                setSystemAudioMode(mSystemAudioControlFeatureEnabled);

            } else {

                onNewAvrAdded(getAvrDeviceInfo());

            }

        }

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

+3 −3
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ final class SetArcTransmissionStateAction extends HdmiCecFeatureAction { 
    }



    private void setArcStatus(boolean enabled) {

        boolean wasEnabled = tv().setArcStatus(enabled);

        Slog.i(TAG, "Change arc status [old:" + wasEnabled + ", new:" + enabled + "]");

        tv().setArcStatus(enabled);

        Slog.i(TAG, "Change arc status to " + enabled);



        // If enabled before and set to "disabled" and send <Report Arc Terminated> to

        // av reciever.

        if (!enabled && wasEnabled) {

        if (!enabled) {

            sendCommand(HdmiCecMessageBuilder.buildReportArcTerminated(getSourceAddress(),

                    mAvrAddress));

        }