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

Commit 05955bd1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable CEC version limiting tests" into sc-dev

parents 2f395f33 1def1383

services/core/java/com/android/server/hdmi/HdmiControlService.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -221,7 +221,7 @@ public class HdmiControlService extends SystemService { 
    private int mHdmiCecVolumeControl;

    private int mHdmiCecVolumeControl;





    // Make sure HdmiCecConfig is instantiated and the XMLs are read.

    // Make sure HdmiCecConfig is instantiated and the XMLs are read.

    private final HdmiCecConfig mHdmiCecConfig;

    private HdmiCecConfig mHdmiCecConfig;





    /**

    /**

     * Interface to report send result.

     * Interface to report send result.
@@ -580,6 +580,11 @@ public class HdmiControlService extends SystemService { 
        mHdmiCecNetwork = hdmiCecNetwork;

        mHdmiCecNetwork = hdmiCecNetwork;

    }

    }





    @VisibleForTesting

    void setHdmiCecConfig(HdmiCecConfig hdmiCecConfig) {

        mHdmiCecConfig = hdmiCecConfig;

    }



    public HdmiCecNetwork getHdmiCecNetwork() {

    public HdmiCecNetwork getHdmiCecNetwork() {

        return mHdmiCecNetwork;

        return mHdmiCecNetwork;

    }

    }

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -74,8 +74,6 @@ public class ActiveSourceActionTest { 
        when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);

        when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);





        HdmiCecConfig hdmiCecConfig = new FakeHdmiCecConfig(mContextSpy);



        mHdmiControlService = new HdmiControlService(mContextSpy) {

        mHdmiControlService = new HdmiControlService(mContextSpy) {

            @Override

            @Override

            AudioManager getAudioManager() {

            AudioManager getAudioManager() {
@@ -106,15 +104,11 @@ public class ActiveSourceActionTest { 
            protected void writeStringSystemProperty(String key, String value) {

            protected void writeStringSystemProperty(String key, String value) {

                // do nothing

                // do nothing

            }

            }



            @Override

            protected HdmiCecConfig getHdmiCecConfig() {

                return hdmiCecConfig;

            }

        };

        };





        Looper looper = mTestLooper.getLooper();

        Looper looper = mTestLooper.getLooper();

        mHdmiControlService.setIoLooper(looper);

        mHdmiControlService.setIoLooper(looper);

        mHdmiControlService.setHdmiCecConfig(new FakeHdmiCecConfig(mContextSpy));

        mNativeWrapper = new FakeNativeWrapper();

        mNativeWrapper = new FakeNativeWrapper();

        HdmiCecController hdmiCecController = HdmiCecController.createWithNativeWrapper(

        HdmiCecController hdmiCecController = HdmiCecController.createWithNativeWrapper(

                this.mHdmiControlService, mNativeWrapper, mHdmiControlService.getAtomWriter());

                this.mHdmiControlService, mNativeWrapper, mHdmiControlService.getAtomWriter());

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -76,8 +76,6 @@ public class ArcInitiationActionFromAvrTest { 
        when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);

        when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);





        HdmiCecConfig hdmiCecConfig = new FakeHdmiCecConfig(mContextSpy);



        HdmiControlService hdmiControlService =

        HdmiControlService hdmiControlService =

                new HdmiControlService(mContextSpy) {

                new HdmiControlService(mContextSpy) {

                    @Override

                    @Override
@@ -112,11 +110,6 @@ public class ArcInitiationActionFromAvrTest { 
                    Looper getServiceLooper() {

                    Looper getServiceLooper() {

                        return mTestLooper.getLooper();

                        return mTestLooper.getLooper();

                    }

                    }



                    @Override

                    protected HdmiCecConfig getHdmiCecConfig() {

                        return hdmiCecConfig;

                    }

                };

                };





        mHdmiCecLocalDeviceAudioSystem = new HdmiCecLocalDeviceAudioSystem(hdmiControlService) {

        mHdmiCecLocalDeviceAudioSystem = new HdmiCecLocalDeviceAudioSystem(hdmiControlService) {
@@ -128,6 +121,7 @@ public class ArcInitiationActionFromAvrTest { 
        mHdmiCecLocalDeviceAudioSystem.init();

        mHdmiCecLocalDeviceAudioSystem.init();

        Looper looper = mTestLooper.getLooper();

        Looper looper = mTestLooper.getLooper();

        hdmiControlService.setIoLooper(looper);

        hdmiControlService.setIoLooper(looper);

        hdmiControlService.setHdmiCecConfig(new FakeHdmiCecConfig(mContextSpy));

        mNativeWrapper = new FakeNativeWrapper();

        mNativeWrapper = new FakeNativeWrapper();

        HdmiCecController hdmiCecController = HdmiCecController.createWithNativeWrapper(

        HdmiCecController hdmiCecController = HdmiCecController.createWithNativeWrapper(

                hdmiControlService, mNativeWrapper, hdmiControlService.getAtomWriter());

                hdmiControlService, mNativeWrapper, hdmiControlService.getAtomWriter());

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -77,8 +77,6 @@ public class ArcTerminationActionFromAvrTest { 
        when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);

        when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);





        HdmiCecConfig hdmiCecConfig = new FakeHdmiCecConfig(mContextSpy);



        HdmiControlService hdmiControlService =

        HdmiControlService hdmiControlService =

                new HdmiControlService(mContextSpy) {

                new HdmiControlService(mContextSpy) {

                    @Override

                    @Override
@@ -113,15 +111,11 @@ public class ArcTerminationActionFromAvrTest { 
                    Looper getServiceLooper() {

                    Looper getServiceLooper() {

                        return mTestLooper.getLooper();

                        return mTestLooper.getLooper();

                    }

                    }



                    @Override

                    protected HdmiCecConfig getHdmiCecConfig() {

                        return hdmiCecConfig;

                    }

                };

                };





        Looper looper = mTestLooper.getLooper();

        Looper looper = mTestLooper.getLooper();

        hdmiControlService.setIoLooper(looper);

        hdmiControlService.setIoLooper(looper);

        hdmiControlService.setHdmiCecConfig(new FakeHdmiCecConfig(mContextSpy));

        mNativeWrapper = new FakeNativeWrapper();

        mNativeWrapper = new FakeNativeWrapper();

        HdmiCecController hdmiCecController = HdmiCecController.createWithNativeWrapper(

        HdmiCecController hdmiCecController = HdmiCecController.createWithNativeWrapper(

                hdmiControlService, mNativeWrapper, hdmiControlService.getAtomWriter());

                hdmiControlService, mNativeWrapper, hdmiControlService.getAtomWriter());

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -86,8 +86,6 @@ public class DevicePowerStatusActionTest { 
        when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);

        when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);





        HdmiCecConfig hdmiCecConfig = new FakeHdmiCecConfig(mContextSpy);



        mHdmiControlService = new HdmiControlService(mContextSpy) {

        mHdmiControlService = new HdmiControlService(mContextSpy) {

            @Override

            @Override

            AudioManager getAudioManager() {

            AudioManager getAudioManager() {
@@ -118,15 +116,11 @@ public class DevicePowerStatusActionTest { 
            protected void writeStringSystemProperty(String key, String value) {

            protected void writeStringSystemProperty(String key, String value) {

                // do nothing

                // do nothing

            }

            }



            @Override

            protected HdmiCecConfig getHdmiCecConfig() {

                return hdmiCecConfig;

            }

        };

        };





        Looper looper = mTestLooper.getLooper();

        Looper looper = mTestLooper.getLooper();

        mHdmiControlService.setIoLooper(looper);

        mHdmiControlService.setIoLooper(looper);

        mHdmiControlService.setHdmiCecConfig(new FakeHdmiCecConfig(mContextSpy));

        mNativeWrapper = new FakeNativeWrapper();

        mNativeWrapper = new FakeNativeWrapper();

        HdmiCecController hdmiCecController = HdmiCecController.createWithNativeWrapper(

        HdmiCecController hdmiCecController = HdmiCecController.createWithNativeWrapper(

                this.mHdmiControlService, mNativeWrapper, mHdmiControlService.getAtomWriter());

                this.mHdmiControlService, mNativeWrapper, mHdmiControlService.getAtomWriter());