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

Commit 1d0b4499 authored by Paul Colța's avatar Paul Colța Committed by Android (Google) Code Review
Browse files

Merge "HDMI: Update default RROs for power control mode" into main

parents 9b463b88 049ab223

core/res/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -5942,9 +5942,9 @@ 
    <bool name="config_cecPowerControlModeTv_allowed">true</bool>

    <bool name="config_cecPowerControlModeTv_default">false</bool>

    <bool name="config_cecPowerControlModeTvAndAudioSystem_allowed">true</bool>

    <bool name="config_cecPowerControlModeTvAndAudioSystem_default">true</bool>

    <bool name="config_cecPowerControlModeTvAndAudioSystem_default">false</bool>

    <bool name="config_cecPowerControlModeBroadcast_allowed">true</bool>

    <bool name="config_cecPowerControlModeBroadcast_default">false</bool>

    <bool name="config_cecPowerControlModeBroadcast_default">true</bool>

    <bool name="config_cecPowerControlModeNone_allowed">true</bool>

    <bool name="config_cecPowerControlModeNone_default">false</bool>

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

+5 −1
Original line number Diff line number Diff line
@@ -277,6 +277,10 @@ public class DevicePowerStatusActionTest { 


    @Test

    public void pendingActionDoesNotBlockSendingStandby() throws Exception {

        mPlaybackDevice.mService.getHdmiCecConfig().setStringValue(

                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,

                HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);



        HdmiCecMessage message = HdmiCecMessageBuilder.buildActiveSource(

                mPlaybackDevice.getDeviceInfo().getLogicalAddress(),

                mPhysicalAddress);
@@ -291,7 +295,7 @@ public class DevicePowerStatusActionTest { 
        mTestLooper.dispatchAll();

        HdmiCecMessage standbyMessage =

                HdmiCecMessageBuilder.buildStandby(

                        mPlaybackDevice.getDeviceInfo().getLogicalAddress(), ADDR_TV);

                        mPlaybackDevice.getDeviceInfo().getLogicalAddress(), ADDR_BROADCAST);

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

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -98,11 +98,11 @@ final class FakeHdmiCecConfig extends HdmiCecConfig { 
                R.bool.config_cecPowerControlModeTv_default);

        doReturn(true).when(resources).getBoolean(

                R.bool.config_cecPowerControlModeTvAndAudioSystem_allowed);

        doReturn(true).when(resources).getBoolean(

        doReturn(false).when(resources).getBoolean(

                R.bool.config_cecPowerControlModeTvAndAudioSystem_default);

        doReturn(true).when(resources).getBoolean(

                R.bool.config_cecPowerControlModeBroadcast_allowed);

        doReturn(false).when(resources).getBoolean(

        doReturn(true).when(resources).getBoolean(

                R.bool.config_cecPowerControlModeBroadcast_default);

        doReturn(true).when(resources).getBoolean(

                R.bool.config_cecPowerControlModeNone_allowed);

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

+5 −5
Original line number Diff line number Diff line
@@ -310,17 +310,17 @@ public final class HdmiCecConfigTest { 
        HdmiCecConfig hdmiCecConfig = new HdmiCecConfig(mContext, mStorageAdapter);

        assertThat(hdmiCecConfig.getDefaultStringValue(

                    HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE))

                .isEqualTo(HdmiControlManager.POWER_CONTROL_MODE_TV_AND_AUDIO_SYSTEM);

                .isEqualTo(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);

    }



    @Test

    public void getDefaultStringValue_WithOverride() {

        setBooleanResource(R.bool.config_cecPowerControlModeTvAndAudioSystem_default, false);

        setBooleanResource(R.bool.config_cecPowerControlModeBroadcast_default, true);

        setBooleanResource(R.bool.config_cecPowerControlModeBroadcast_default, false);

        setBooleanResource(R.bool.config_cecPowerControlModeTvAndAudioSystem_default, true);

        HdmiCecConfig hdmiCecConfig = new HdmiCecConfig(mContext, mStorageAdapter);

        assertThat(hdmiCecConfig.getDefaultStringValue(

                    HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE))

                .isEqualTo(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);

                .isEqualTo(HdmiControlManager.POWER_CONTROL_MODE_TV_AND_AUDIO_SYSTEM);

    }



    @Test
@@ -334,7 +334,7 @@ public final class HdmiCecConfigTest { 


    @Test

    public void getDefaultStringValue_NoDefault() {

        setBooleanResource(R.bool.config_cecPowerControlModeTvAndAudioSystem_default, false);

        setBooleanResource(R.bool.config_cecPowerControlModeBroadcast_default, false);

        assertThrows(RuntimeException.class,

                () -> new HdmiCecConfig(mContext, mStorageAdapter));

    }