From 7671374f4e19e5ab420aa2988cdd174d20d195f8 Mon Sep 17 00:00:00 2001 From: Paul Colta Date: Mon, 31 Oct 2022 10:50:57 +0100 Subject: [PATCH] HDMICEC: Remove local device Audio System from mLocalDevicesTypes When CEC is initialized on the DUT, the list mLocalDevicesTypes is used to get the types of local devices to be allocated. Using this list inside the HdmiControlService's constructor for unit tests was introduced by the change ag/20257160. A local device of type Audio System shouldn't be allocated for each tests, the tests being the only tests requiring this. This change impacts the Dynamic Soundbar mode's unit tests where it is expected for a local device Audio System to be included or removed from the network after CEC initialization. Bug: 256567948 Test: make && atest HdmiControlServiceTest Change-Id: I16535b1ce077b38411f31bfc41d18e7734fcedac --- .../src/com/android/server/hdmi/HdmiControlServiceTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java index 1b867be816693..8f6bee170b0e1 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java @@ -92,7 +92,6 @@ public class HdmiControlServiceTest { HdmiCecConfig hdmiCecConfig = new FakeHdmiCecConfig(mContextSpy); mLocalDeviceTypes.add(HdmiDeviceInfo.DEVICE_PLAYBACK); - mLocalDeviceTypes.add(DEVICE_AUDIO_SYSTEM); mHdmiControlServiceSpy = spy(new HdmiControlService(mContextSpy, mLocalDeviceTypes, new FakeAudioDeviceVolumeManagerWrapper())); @@ -480,6 +479,7 @@ public class HdmiControlServiceTest { HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION, HdmiControlManager.HDMI_CEC_VERSION_2_0); mHdmiControlServiceSpy.setControlEnabled(HdmiControlManager.HDMI_CEC_CONTROL_ENABLED); + mHdmiControlServiceSpy.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC); mTestLooper.dispatchAll(); mNativeWrapper.onCecMessage(HdmiCecMessageBuilder.buildGiveFeatures(Constants.ADDR_TV, @@ -501,6 +501,7 @@ public class HdmiControlServiceTest { HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION, HdmiControlManager.HDMI_CEC_VERSION_1_4_B); mHdmiControlServiceSpy.setControlEnabled(HdmiControlManager.HDMI_CEC_CONTROL_ENABLED); + mHdmiControlServiceSpy.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC); mTestLooper.dispatchAll(); HdmiCecMessage reportFeatures = ReportFeaturesMessage.build( @@ -517,6 +518,7 @@ public class HdmiControlServiceTest { HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION, HdmiControlManager.HDMI_CEC_VERSION_2_0); mHdmiControlServiceSpy.setControlEnabled(HdmiControlManager.HDMI_CEC_CONTROL_ENABLED); + mHdmiControlServiceSpy.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC); mTestLooper.dispatchAll(); HdmiCecMessage reportFeatures = ReportFeaturesMessage.build(