diff options
4 files changed, 14 insertions, 10 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 281053b6ce7b..bb6f3fcf50fb 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -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> diff --git a/services/tests/servicestests/src/com/android/server/hdmi/DevicePowerStatusActionTest.java b/services/tests/servicestests/src/com/android/server/hdmi/DevicePowerStatusActionTest.java index af4eab39492d..922706e16a75 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/DevicePowerStatusActionTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/DevicePowerStatusActionTest.java @@ -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); } } diff --git a/services/tests/servicestests/src/com/android/server/hdmi/FakeHdmiCecConfig.java b/services/tests/servicestests/src/com/android/server/hdmi/FakeHdmiCecConfig.java index 167e0f80ef28..97836bb9a704 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/FakeHdmiCecConfig.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/FakeHdmiCecConfig.java @@ -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); diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java index 870b68165281..d8c58a8e16b6 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java @@ -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)); } |