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

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

Merge "Rename send_standby_on_sleep" into sc-dev

parents d2c062b8 d1c02ba8

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -4766,7 +4766,7 @@ 
    <bool name="config_cecHdmiCecVersion20_allowed">true</bool>

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



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

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

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

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

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

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -4247,7 +4247,7 @@ 
  <java-symbol type="bool" name="config_cecHdmiCecVersion20_allowed" />

  <java-symbol type="bool" name="config_cecHdmiCecVersion20_default" />



  <java-symbol type="bool" name="config_cecSendStandbyOnSleep_userConfigurable" />

  <java-symbol type="bool" name="config_cecPowerControlMode_userConfigurable" />

  <java-symbol type="bool" name="config_cecPowerControlModeTv_allowed" />

  <java-symbol type="bool" name="config_cecPowerControlModeTv_default" />

  <java-symbol type="bool" name="config_cecPowerControlModeBroadcast_allowed" />

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

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ public class HdmiCecConfig { 


        Setting powerControlMode = registerSetting(

                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,

                R.bool.config_cecSendStandbyOnSleep_userConfigurable);

                R.bool.config_cecPowerControlMode_userConfigurable);

        powerControlMode.registerValue(HdmiControlManager.POWER_CONTROL_MODE_TV,

                R.bool.config_cecPowerControlModeTv_allowed,

                R.bool.config_cecPowerControlModeTv_default);

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

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ final class FakeHdmiCecConfig extends HdmiCecConfig { 
                R.bool.config_cecHdmiCecVersion20_default);



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

                R.bool.config_cecSendStandbyOnSleep_userConfigurable);

                R.bool.config_cecPowerControlMode_userConfigurable);

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

                R.bool.config_cecPowerControlModeTv_allowed);

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

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

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ public final class HdmiCecConfigTest { 


    @Test

    public void setStringValue_NotConfigurable() {

        setBooleanResource(R.bool.config_cecSendStandbyOnSleep_userConfigurable, false);

        setBooleanResource(R.bool.config_cecPowerControlMode_userConfigurable, false);

        HdmiCecConfig hdmiCecConfig = new HdmiCecConfig(mContext, mStorageAdapter);

        assertThrows(IllegalArgumentException.class,

                () -> hdmiCecConfig.setStringValue(