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

Commit 972aacc0 authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Android (Google) Code Review
Browse files

Merge "Always start DeviceSelectAction with <Set Stream Path>" into sc-dev

parents 41b553c0 4c0c963f

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

+3 −3
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ final class DeviceSelectAction extends HdmiCecFeatureAction { 


    @Override

    public boolean start() {

        if (mIsCec20) {

      // Wake-up on <Set Stream Path> was not mandatory before CEC 2.0.

      // The message is re-sent at the end of the action for devices that don't support 2.0.

      sendSetStreamPath();

        }

        int targetPowerStatus = localDevice().mService.getHdmiCecNetwork()

                .getCecDeviceInfo(getTargetAddress()).getDevicePowerStatus();

        if (!mIsCec20 || targetPowerStatus == HdmiControlManager.POWER_STATUS_UNKNOWN) {

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

+17 −1
Original line number Diff line number Diff line
@@ -221,7 +221,8 @@ public class DeviceSelectActionTest { 
                                                 "testDeviceSelect");

        action.start();

        mTestLooper.dispatchAll();

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(SET_STREAM_PATH);

        assertThat(mNativeWrapper.getResultMessages()).contains(SET_STREAM_PATH);

        mNativeWrapper.clearResultMessages();

        assertThat(actionTimer.getState()).isEqualTo(STATE_WAIT_FOR_REPORT_POWER_STATUS);

        action.processCommand(REPORT_POWER_STATUS_ON);

        mTestLooper.dispatchAll();
@@ -238,12 +239,15 @@ public class DeviceSelectActionTest { 
        DeviceSelectAction action = createDeviceSelectAction(actionTimer, callback,

                                        /*isCec20=*/false);

        action.start();

        mTestLooper.dispatchAll();

        assertThat(mNativeWrapper.getResultMessages()).contains(SET_STREAM_PATH);

        assertThat(actionTimer.getState()).isEqualTo(STATE_WAIT_FOR_REPORT_POWER_STATUS);

        action.processCommand(REPORT_POWER_STATUS_STANDBY);

        mTestLooper.dispatchAll();

        HdmiCecMessage userControlPressed = HdmiCecMessageBuilder.buildUserControlPressed(

                        ADDR_TV, ADDR_PLAYBACK_1, HdmiCecKeycode.CEC_KEYCODE_POWER);

        assertThat(mNativeWrapper.getResultMessages()).contains(userControlPressed);

        mNativeWrapper.clearResultMessages();

        assertThat(actionTimer.getState()).isEqualTo(STATE_WAIT_FOR_DEVICE_POWER_ON);

        action.handleTimerEvent(STATE_WAIT_FOR_DEVICE_POWER_ON);

        action.processCommand(REPORT_POWER_STATUS_ON);
@@ -261,6 +265,9 @@ public class DeviceSelectActionTest { 
        DeviceSelectAction action = createDeviceSelectAction(actionTimer, callback,

                                        /*isCec20=*/false);

        action.start();

        mTestLooper.dispatchAll();

        assertThat(mNativeWrapper.getResultMessages()).contains(SET_STREAM_PATH);

        mNativeWrapper.clearResultMessages();

        assertThat(actionTimer.getState()).isEqualTo(STATE_WAIT_FOR_REPORT_POWER_STATUS);

        action.processCommand(REPORT_POWER_STATUS_STANDBY);

        assertThat(actionTimer.getState()).isEqualTo(STATE_WAIT_FOR_DEVICE_POWER_ON);
@@ -285,6 +292,9 @@ public class DeviceSelectActionTest { 
        DeviceSelectAction action = createDeviceSelectAction(actionTimer, callback,

                                        /*isCec20=*/false);

        action.start();

        mTestLooper.dispatchAll();

        assertThat(mNativeWrapper.getResultMessages()).contains(SET_STREAM_PATH);

        mNativeWrapper.clearResultMessages();

        assertThat(actionTimer.getState()).isEqualTo(STATE_WAIT_FOR_REPORT_POWER_STATUS);

        action.processCommand(REPORT_POWER_STATUS_STANDBY);

        assertThat(actionTimer.getState()).isEqualTo(STATE_WAIT_FOR_DEVICE_POWER_ON);
@@ -330,8 +340,11 @@ public class DeviceSelectActionTest { 
        action.start();

        mTestLooper.dispatchAll();

        assertThat(mNativeWrapper.getResultMessages()).contains(SET_STREAM_PATH);

        mNativeWrapper.clearResultMessages();

        assertThat(actionTimer.getState()).isEqualTo(STATE_WAIT_FOR_REPORT_POWER_STATUS);

        action.processCommand(REPORT_POWER_STATUS_ON);

        mTestLooper.dispatchAll();

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(SET_STREAM_PATH);

        assertThat(callback.getResult()).isEqualTo(HdmiControlManager.RESULT_SUCCESS);

    }
@@ -354,9 +367,12 @@ public class DeviceSelectActionTest { 
        HdmiCecMessage userControlPressed = HdmiCecMessageBuilder.buildUserControlPressed(

                        ADDR_TV, ADDR_PLAYBACK_1, HdmiCecKeycode.CEC_KEYCODE_POWER);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(userControlPressed);

        mNativeWrapper.clearResultMessages();

        assertThat(actionTimer.getState()).isEqualTo(STATE_WAIT_FOR_DEVICE_POWER_ON);

        action.handleTimerEvent(STATE_WAIT_FOR_DEVICE_POWER_ON);

        action.processCommand(REPORT_POWER_STATUS_ON);

        mTestLooper.dispatchAll();

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(SET_STREAM_PATH);

        assertThat(callback.getResult()).isEqualTo(HdmiControlManager.RESULT_SUCCESS);

    }

}