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

Commit acee7f2e authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Automerger Merge Worker
Browse files

Merge "Send <Inactive Source> if put to standby by connected device" into... 

Merge "Send <Inactive Source> if put to standby by connected device" into sc-dev am: 2c987129 am: 4c39b6f1

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

Change-Id: I0febf28ccf1db01fa42223940898f27767c57227
parents 733e283b 4c39b6f1

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

+6 −1
Original line number Diff line number Diff line
@@ -143,7 +143,12 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        boolean mTvSendStandbyOnSleep = mService.getHdmiCecConfig().getIntValue(

                HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP)

                    == HdmiControlManager.TV_SEND_STANDBY_ON_SLEEP_ENABLED;

        if (initiatedByCec || !mTvSendStandbyOnSleep || !wasActiveSource) {

        if (!wasActiveSource) {

            return;

        }

        if (initiatedByCec || !mTvSendStandbyOnSleep) {

            mService.sendCecCommand(HdmiCecMessageBuilder.buildInactiveSource(mAddress,

                            mService.getPhysicalAddress()));

            return;

        }

        switch (standbyAction) {

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

+25 −0
Original line number Diff line number Diff line
@@ -832,6 +832,31 @@ public class HdmiCecLocalDevicePlaybackTest { 
        assertThat(mNativeWrapper.getResultMessages()).contains(inactiveSource);

    }



    @Test

    public void handleOnStandby_CecMessageReceived() {

        mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(

                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,

                HdmiControlManager.POWER_CONTROL_MODE_TV);

        mHdmiCecLocalDevicePlayback.setActiveSource(mPlaybackLogicalAddress,

                mPlaybackPhysicalAddress, "HdmiCecLocalDevicePlaybackTest");

        mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setIntValue(

                HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP,

                HdmiControlManager.TV_SEND_STANDBY_ON_SLEEP_ENABLED);

        mHdmiCecLocalDevicePlayback.onStandby(true, HdmiControlService.STANDBY_SCREEN_OFF);

        mTestLooper.dispatchAll();



        HdmiCecMessage standbyMessageToTv = HdmiCecMessageBuilder.buildStandby(

                mHdmiCecLocalDevicePlayback.mAddress, ADDR_TV);

        HdmiCecMessage standbyMessageBroadcast = HdmiCecMessageBuilder.buildStandby(

                mHdmiCecLocalDevicePlayback.mAddress, ADDR_BROADCAST);

        HdmiCecMessage inactiveSource = HdmiCecMessageBuilder.buildInactiveSource(

                mPlaybackLogicalAddress, mPlaybackPhysicalAddress);



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

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

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

    }



    @Test

    public void handleOnInitializeCecComplete_ByEnableCec() {

        mHdmiCecLocalDevicePlayback.onInitializeCecComplete(