Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61fb74c1 authored by Paul Colța's avatar Paul Colța Committed by Android (Google) Code Review
Browse files

Merge "HDMICEC: Remove local device Audio System from mLocalDevicesTypes"

parents d1b90dae 7671374f

services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java

+3 −1
Original line number Diff line number Diff line
@@ -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(