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

Commit 9b7f74f6 authored by Yan Han's avatar Yan Han
Browse files

Refactor handling of <Feature Abort> responses 

When handling a message, local devices return a constant instead of
a boolean. The constant represents 3 cases:
1. A <Feature Abort> response with a specific operand
2. The message was successfully handled
3. The message was not handled

This allows (almost) all <Feature Abort> messages to be sent by
HdmiCecController instead of local devices.

Test: atest com.android.server.hdmi
Bug: 180103617
Change-Id: If3a65f512c689a1b0596dd4b8d9fcf489c3468e3
parent abe60b35

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

+18 −3
Original line number Diff line number Diff line
@@ -250,7 +250,19 @@ final class Constants { 


    @Retention(RetentionPolicy.SOURCE)

    @IntDef({

        ABORT_NO_ERROR,

            NOT_HANDLED,

            HANDLED,

            ABORT_UNRECOGNIZED_OPCODE,

            ABORT_NOT_IN_CORRECT_MODE,

            ABORT_CANNOT_PROVIDE_SOURCE,

            ABORT_INVALID_OPERAND,

            ABORT_REFUSED,

            ABORT_UNABLE_TO_DETERMINE,

    })

    public @interface HandleMessageResult {}



    @Retention(RetentionPolicy.SOURCE)

    @IntDef({

        ABORT_UNRECOGNIZED_OPCODE,

        ABORT_NOT_IN_CORRECT_MODE,

        ABORT_CANNOT_PROVIDE_SOURCE,
@@ -260,8 +272,11 @@ final class Constants { 
    })

    public @interface AbortReason {}



    // Internal abort error code. It's the same as success.

    static final int ABORT_NO_ERROR = -1;

    // Indicates that a message was not handled, but could be handled by another local device.

    // If no local devices handle the message, we send <Feature Abort>[Unrecognized Opcode].

    static final int NOT_HANDLED = -2;

    // Indicates that a message has been handled successfully; no feature abort needed.

    static final int HANDLED = -1;

    // Constants related to operands of HDMI CEC commands.

    // Refer to CEC Table 29 in HDMI Spec v1.4b.

    // [Abort Reason]

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

+12 −7
Original line number Diff line number Diff line
@@ -565,19 +565,24 @@ final class HdmiCecController { 
    }



    @ServiceThreadOnly

    private void onReceiveCommand(HdmiCecMessage message) {

    @VisibleForTesting

    void onReceiveCommand(HdmiCecMessage message) {

        assertRunOnServiceThread();

        if ((isAcceptableAddress(message.getDestination())

            || !mService.isAddressAllocated())

            && mService.handleCecCommand(message)) {

        if (mService.isAddressAllocated() && !isAcceptableAddress(message.getDestination())) {

            return;

        }

        // Not handled message, so we will reply it with <Feature Abort>.

        @Constants.HandleMessageResult int messageState = mService.handleCecCommand(message);

        if (messageState == Constants.NOT_HANDLED) {

            // Message was not handled

            maySendFeatureAbortCommand(message, Constants.ABORT_UNRECOGNIZED_OPCODE);

        } else if (messageState != Constants.HANDLED) {

            // Message handler wants to send a feature abort

            maySendFeatureAbortCommand(message, messageState);

        }

    }



    @ServiceThreadOnly

    void maySendFeatureAbortCommand(HdmiCecMessage message, int reason) {

    void maySendFeatureAbortCommand(HdmiCecMessage message, @Constants.AbortReason int reason) {

        assertRunOnServiceThread();

        // Swap the source and the destination.

        int src = message.getDestination();

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

+154 −109

File changed.

Preview size limit exceeded, changes collapsed.

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

+55 −48

File changed.

Preview size limit exceeded, changes collapsed.

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

+22 −16

File changed.

Preview size limit exceeded, changes collapsed.