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
This commit is contained in:
Paul Colta
2022-10-21 17:26:06 +02:00
parent 9d569c3d95
commit 6ed307bd07

View File

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