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

Commit 4386fe77 authored by Marvin Ramin's avatar Marvin Ramin
Browse files

Update Feature Abort logic for vendor command messages 

Update the Feature Abort reason for unsupported vendor command messages.

Bug: 169121148
Test: atest HdmiCecLocalDeviceTest

Change-Id: I9389ee16f172c3ca825065cf4c8c7464872cd3bc
parent 31f217fa

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

+3 −3
Original line number Diff line number Diff line
@@ -752,8 +752,8 @@ abstract class HdmiCecLocalDevice { 
                message.getParams(),

                false)) {

            // Vendor command listener may not have been registered yet. Respond with

            // <Feature Abort> [NOT_IN_CORRECT_MODE] so that the sender can try again later.

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_NOT_IN_CORRECT_MODE);

            // <Feature Abort> [Refused] so that the sender can try again later.

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

        }

        return true;

    }
@@ -764,7 +764,7 @@ abstract class HdmiCecLocalDevice { 
        if (vendorId == mService.getVendorId()) {

            if (!mService.invokeVendorCommandListenersOnReceived(

                    mDeviceType, message.getSource(), message.getDestination(), params, true)) {

                mService.maySendFeatureAbortCommand(message, Constants.ABORT_NOT_IN_CORRECT_MODE);

                mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

            }

        } else if (message.getDestination() != Constants.ADDR_BROADCAST

                && message.getSource() != Constants.ADDR_UNREGISTERED) {

services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTest.java

+47 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.server.hdmi.Constants.ADDR_TV; 
import static com.android.server.hdmi.Constants.ADDR_UNREGISTERED;

import static com.android.server.hdmi.Constants.MESSAGE_DEVICE_VENDOR_ID;

import static com.android.server.hdmi.Constants.MESSAGE_REPORT_PHYSICAL_ADDRESS;

import static com.android.server.hdmi.HdmiControlService.INITIATED_BY_ENABLE_CEC;



import static com.google.common.truth.Truth.assertThat;
@@ -32,6 +33,7 @@ import static junit.framework.Assert.assertFalse; 
import static junit.framework.Assert.assertTrue;



import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiPortInfo;

import android.os.test.TestLooper;

import android.platform.test.annotations.Presubmit;
@@ -43,6 +45,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;
@@ -53,6 +56,8 @@ import java.util.List; 
/** Tests for {@link HdmiCecLocalDevice} class. */

public class HdmiCecLocalDeviceTest {



    private FakeNativeWrapper mNativeWrapper;



    private static int SendCecCommandFactory(int srcAddress, int dstAddress, byte[] body) {

        switch (body[0] & 0xFF) {

                /** {@link Constants#MESSAGE_GIVE_PHYSICAL_ADDRESS} */
@@ -104,6 +109,7 @@ public class HdmiCecLocalDeviceTest { 
    private MyHdmiCecLocalDevice mHdmiLocalDevice;

    private HdmiControlService mHdmiControlService;

    private HdmiCecController mHdmiCecController;

    private ArrayList<HdmiCecLocalDevice> mLocalDevices = new ArrayList<>();

    private TestLooper mTestLooper = new TestLooper();

    private static int mDesAddr = -1;

    private static int mSrcAddr = -1;
@@ -138,6 +144,10 @@ public class HdmiCecLocalDeviceTest { 
                                == HdmiControlManager.POWER_STATUS_TRANSIENT_TO_STANDBY;

                    }



                    @Override

                    protected void writeStringSystemProperty(String key, String value) {

                    }



                    @Override

                    void standby() {

                        mStandbyMessageReceived = true;
@@ -149,8 +159,9 @@ public class HdmiCecLocalDeviceTest { 
                    }

                };

        mHdmiControlService.setIoLooper(mTestLooper.getLooper());

        mNativeWrapper = new FakeNativeWrapper();

        mHdmiCecController = HdmiCecController.createWithNativeWrapper(

                mHdmiControlService, new FakeNativeWrapper(), mHdmiControlService.getAtomWriter());

                mHdmiControlService, mNativeWrapper, mHdmiControlService.getAtomWriter());

        mHdmiControlService.setCecController(mHdmiCecController);

        mHdmiLocalDevice = new MyHdmiCecLocalDevice(mHdmiControlService, DEVICE_TV);

        mMessageValidator =
@@ -161,14 +172,25 @@ public class HdmiCecLocalDeviceTest { 
                    }

                };

        mHdmiControlService.setMessageValidator(mMessageValidator);



        mLocalDevices.add(mHdmiLocalDevice);

        HdmiPortInfo[] hdmiPortInfos = new HdmiPortInfo[1];

        hdmiPortInfos[0] =

                new HdmiPortInfo(1, HdmiPortInfo.PORT_OUTPUT, 0x0000, true, false, false);

        mNativeWrapper.setPortInfo(hdmiPortInfos);

        mNativeWrapper.setPortConnectionStatus(1, true);

        mHdmiControlService.initService();

        mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);

        mNativeWrapper.setPhysicalAddress(0x2000);

        mTestLooper.dispatchAll();

    }



    @Test

    public void dispatchMessage_desNotValid() {

    public void dispatchMessage_logicalAddressDoesNotMatch() {

        HdmiCecMessage msg =

                new HdmiCecMessage(

                        ADDR_TV,

                        ADDR_TV,

                        ADDR_PLAYBACK_1,

                        Constants.MESSAGE_CEC_VERSION,

                        HdmiCecMessage.EMPTY_PARAM);

        boolean handleResult = mHdmiLocalDevice.dispatchMessage(msg);
@@ -384,4 +406,26 @@ public class HdmiCecLocalDeviceTest { 
        assertThat(mWakeupMessageReceived).isFalse();

        assertThat(mStandbyMessageReceived).isTrue();

    }



    @Test

    public void handleVendorCommand_notHandled() {

        HdmiCecMessage vendorCommand = HdmiCecMessageBuilder.buildVendorCommand(ADDR_TV,

                ADDR_PLAYBACK_1, new byte[]{0});

        mNativeWrapper.onCecMessage(vendorCommand);

        mTestLooper.dispatchAll();



        HdmiCecMessageBuilder.buildFeatureAbortCommand(ADDR_PLAYBACK_1, ADDR_TV,

                vendorCommand.getOpcode(), Constants.ABORT_REFUSED);

    }



    @Test

    public void handleVendorCommandWithId_notHandled_Cec14() {

        HdmiCecMessage vendorCommand = HdmiCecMessageBuilder.buildVendorCommandWithId(ADDR_TV,

                ADDR_PLAYBACK_1, 0x1234, new byte[]{0});

        mNativeWrapper.onCecMessage(vendorCommand);

        mTestLooper.dispatchAll();



        HdmiCecMessageBuilder.buildFeatureAbortCommand(ADDR_PLAYBACK_1, ADDR_TV,

                vendorCommand.getOpcode(), Constants.ABORT_REFUSED);

    }

}