Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename send_standby_on_sleep" into sc-dev

Browse Source
This commit is contained in:
Nathalie Le Clair
2021-04-13 07:26:07 +00:00
committed by Android (Google) Code Review
parent d2c062b8f0 d1c02ba891
commit a13c9782b8
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/config.xml
View File

@@ -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>

2
core/res/res/values/symbols.xml
View File

@@ -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" />

2
services/core/java/com/android/server/hdmi/HdmiCecConfig.java
View File

@@ -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);

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

@@ -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(

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

@@ -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(