summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Colta <donpaul@google.com> 2022-10-21 17:26:06 +0200
committer Paul Colta <donpaul@google.com> 2022-10-24 14:32:23 +0200
commit6ed307bd074ed3fdc8fac943e633c3dab655fa2f (patch)
tree6ab32855946c8bebe4bc5cb368c1a1fc63a19412
parent9d569c3d952da90f06765f2f47d0c3ab45c5429a (diff)
HDMICEC: Fix failing HdmiCecLocalDeviceTvTest tests
Set the CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL setting to the value expected inside the test. Bug: 254848677 Test: atest com.android.server.hdmi.HdmiCecLocalDeviceTvTest Change-Id: I509335cdc5e95872f06cc1ef3cd1abe25b9fd883
-rw-r--r--services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java
index 8112ca8fbb14..2a342b0b1e9b 100644
--- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java
+++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java
@@ -591,11 +591,15 @@ public class HdmiCecLocalDeviceTvTest {
@Test
public void handleReportAudioStatus_SamOnArcOff_setStreamVolumeNotCalled() {
+ mHdmiControlService.getHdmiCecConfig().setIntValue(
+ HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL,
+ HdmiControlManager.SYSTEM_AUDIO_CONTROL_ENABLED);
// Emulate Audio device on port 0x1000 (does not support ARC)
mNativeWrapper.setPortConnectionStatus(1, true);
HdmiCecMessage hdmiCecMessage = HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(
ADDR_AUDIO_SYSTEM, 0x1000, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
mNativeWrapper.onCecMessage(hdmiCecMessage);
+ mTestLooper.dispatchAll();
HdmiCecFeatureAction systemAudioAutoInitiationAction =
new SystemAudioAutoInitiationAction(mHdmiCecLocalDeviceTv, ADDR_AUDIO_SYSTEM);
@@ -822,6 +826,10 @@ public class HdmiCecLocalDeviceTvTest {
@Test
public void receiveSetAudioVolumeLevel_samActivated_respondsFeatureAbort_noVolumeChange() {
+ mHdmiControlService.getHdmiCecConfig().setIntValue(
+ HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL,
+ HdmiControlManager.SYSTEM_AUDIO_CONTROL_ENABLED);
+
mNativeWrapper.onCecMessage(HdmiCecMessageBuilder.buildSetSystemAudioMode(
ADDR_AUDIO_SYSTEM, ADDR_TV, true));
mTestLooper.dispatchAll();