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

Commit bffe7bef authored by Yan Han's avatar Yan Han Committed by Automerger Merge Worker
Browse files

Merge changes Ifebc283a,I146fd248 into tm-dev am: a7a729e9 am: 9fa9bdd1 am: 66cbbb8d 

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



Change-Id: I53ca16aa73378cffc3a0942e07e4f128384f3bd3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f8cd335 66cbbb8d

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

+17 −28
Original line number Diff line number Diff line
@@ -810,35 +810,24 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        }

    }



    /**

     * Change ARC status into the given {@code enabled} status.

     *

     * @return {@code true} if ARC was in "Enabled" status

     */

    @ServiceThreadOnly

    boolean setArcStatus(boolean enabled) {

    void enableArc(List<byte[]> supportedSads) {

        assertRunOnServiceThread();

        HdmiLogger.debug("Set Arc Status[old:%b new:true]", mArcEstablished);



        HdmiLogger.debug("Set Arc Status[old:%b new:%b]", mArcEstablished, enabled);

        boolean oldStatus = mArcEstablished;

        if (enabled) {

            RequestSadAction action = new RequestSadAction(

                    this, Constants.ADDR_AUDIO_SYSTEM,

                    new RequestSadAction.RequestSadCallback() {

                        @Override

                        public void onRequestSadDone(List<byte[]> supportedSads) {

                            enableAudioReturnChannel(enabled);

                            notifyArcStatusToAudioService(enabled, supportedSads);

                            mArcEstablished = enabled;

        enableAudioReturnChannel(true);

        notifyArcStatusToAudioService(true, supportedSads);

        mArcEstablished = true;

    }

                    });

            addAndStartAction(action);

        } else {

            enableAudioReturnChannel(enabled);

            notifyArcStatusToAudioService(enabled, new ArrayList<>());

            mArcEstablished = enabled;

        }

        return oldStatus;



    @ServiceThreadOnly

    void disableArc() {

        assertRunOnServiceThread();

        HdmiLogger.debug("Set Arc Status[old:%b new:false]", mArcEstablished);



        enableAudioReturnChannel(false);

        notifyArcStatusToAudioService(false, new ArrayList<>());

        mArcEstablished = false;

    }



    /**
@@ -1066,7 +1055,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    protected int handleTerminateArc(HdmiCecMessage message) {

        assertRunOnServiceThread();

        if (mService .isPowerStandbyOrTransient()) {

            setArcStatus(false);

            disableArc();

            return Constants.HANDLED;

        }

        // Do not check ARC configuration since the AVR might have been already removed.
@@ -1353,7 +1342,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        if (avr == null) {

            return;

        }

        setArcStatus(false);

        disableArc();



        // Seq #44.

        removeAllRunningArcAction();

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ abstract class RequestArcAction extends HdmiCecFeatureAction { 
                    finish();

                    return true;

                } else if (originalOpcode == Constants.MESSAGE_REQUEST_ARC_INITIATION) {

                    tv().setArcStatus(false);

                    tv().disableArc();

                    finish();

                    return true;

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ final class RequestArcInitiationAction extends RequestArcAction { 
            public void onSendCompleted(int error) {

                if (error != SendMessageResult.SUCCESS) {

                    // Turn off ARC status if <Request ARC Initiation> fails.

                    tv().setArcStatus(false);

                    tv().disableArc();

                    finish();

                }

            }

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

+17 −10
Original line number Diff line number Diff line
@@ -181,14 +181,21 @@ final class RequestSadAction extends HdmiCecFeatureAction { 
            return true;

        }

        if (cmd.getOpcode() == Constants.MESSAGE_FEATURE_ABORT

                && (cmd.getParams()[0] & 0xFF) == Constants.MESSAGE_REQUEST_SHORT_AUDIO_DESCRIPTOR

                && (cmd.getParams()[1] & 0xFF) == Constants.ABORT_INVALID_OPERAND) {

                && (cmd.getParams()[0] & 0xFF)

                == Constants.MESSAGE_REQUEST_SHORT_AUDIO_DESCRIPTOR) {

            if ((cmd.getParams()[1] & 0xFF) == Constants.ABORT_UNRECOGNIZED_OPCODE) {

                // SAD feature is not supported

                wrapUpAndFinish();

                return true;

            }

            if ((cmd.getParams()[1] & 0xFF) == Constants.ABORT_INVALID_OPERAND) {

                // Queried SADs are not supported

                mQueriedSadCount += MAX_SAD_PER_REQUEST;

                mTimeoutRetry = 0;

                querySad();

                return true;

            }

        }

        return false;

    }
@@ -211,9 +218,9 @@ final class RequestSadAction extends HdmiCecFeatureAction { 
                querySad();

                return;

            }

            mQueriedSadCount += MAX_SAD_PER_REQUEST;

            mTimeoutRetry = 0;

            querySad();

            // Don't query any other SADs if one of the SAD queries ran into the maximum amount of

            // retries.

            wrapUpAndFinish();

        }

    }

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

+33 −25
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.hardware.hdmi.HdmiDeviceInfo; 
import android.hardware.tv.cec.V1_0.SendMessageResult;

import android.util.Slog;



import java.util.List;



/**

 * Feature action that handles enabling/disabling of ARC transmission channel.

 * Once TV gets &lt;Initiate ARC&gt;, TV sends &lt;Report ARC Initiated&gt; to AV Receiver.
@@ -55,6 +57,12 @@ final class SetArcTransmissionStateAction extends HdmiCecFeatureAction { 
    boolean start() {

        // Seq #37.

        if (mEnabled) {

            // Request SADs before enabling ARC

            RequestSadAction action = new RequestSadAction(

                    localDevice(), Constants.ADDR_AUDIO_SYSTEM,

                    new RequestSadAction.RequestSadCallback() {

                        @Override

                        public void onRequestSadDone(List<byte[]> supportedSads) {

                            // Enable ARC status immediately before sending <Report Arc Initiated>.

                            // If AVR responds with <Feature Abort>, disable ARC status again.

                            // This is different from spec that says that turns ARC status to
@@ -62,14 +70,18 @@ final class SetArcTransmissionStateAction extends HdmiCecFeatureAction { 
                            // <Feature Abort> is received.

                            // But implemented this way to save the time having to wait for

                            // <Feature Abort>.

            setArcStatus(true);

            // If succeeds to send <Report ARC Initiated>, wait general timeout

            // to check whether there is no <Feature Abort> for <Report ARC Initiated>.

                            Slog.i(TAG, "Enabling ARC");

                            tv().enableArc(supportedSads);

                            // If succeeds to send <Report ARC Initiated>, wait general timeout to

                            // check whether there is no <Feature Abort> for <Report ARC Initiated>.

                            mState = STATE_WAITING_TIMEOUT;

                            addTimer(mState, HdmiConfig.TIMEOUT_MS);

                            sendReportArcInitiated();

                        }

                    });

            addAndStartAction(action);

        } else {

            setArcStatus(false);

            disableArc();

            finish();

        }

        return true;
@@ -92,7 +104,7 @@ final class SetArcTransmissionStateAction extends HdmiCecFeatureAction { 
                    case SendMessageResult.NACK:

                        // If <Report ARC Initiated> is negatively ack'ed, disable ARC and

                        // send <Report ARC Terminated> directly.

                        setArcStatus(false);

                        disableArc();

                        HdmiLogger.debug("Failed to send <Report Arc Initiated>.");

                        finish();

                        break;
@@ -101,17 +113,13 @@ final class SetArcTransmissionStateAction extends HdmiCecFeatureAction { 
        });

    }



    private void setArcStatus(boolean enabled) {

        tv().setArcStatus(enabled);

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

    private void disableArc() {

        Slog.i(TAG, "Disabling ARC");



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

        // av reciever.

        if (!enabled) {

        tv().disableArc();

        sendCommand(HdmiCecMessageBuilder.buildReportArcTerminated(getSourceAddress(),

                mAvrAddress));

    }

    }



    @Override

    boolean processCommand(HdmiCecMessage cmd) {
@@ -124,7 +132,7 @@ final class SetArcTransmissionStateAction extends HdmiCecFeatureAction { 
            int originalOpcode = cmd.getParams()[0] & 0xFF;

            if (originalOpcode == Constants.MESSAGE_REPORT_ARC_INITIATED) {

                HdmiLogger.debug("Feature aborted for <Report Arc Initiated>");

                setArcStatus(false);

                disableArc();

                finish();

                return true;

            }