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

Commit a8f4609b authored by Michal Olech's avatar Michal Olech Committed by Android (Google) Code Review
Browse files

Merge "[CEC Configuration] Migrate Settings.Global to HdmiControlManager API"

parents 88bb414f 59fba6ea

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

+1 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ public class OneTouchPlayActionTest { 
        mContextSpy = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));

        mHdmiCecConfig = new FakeHdmiCecConfig(mContextSpy);



        setHdmiControlEnabled(hdmiControlEnabled);



        when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->

                new PowerManager(mContextSpy, mIPowerManagerMock,

                mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
@@ -137,6 +135,7 @@ public class OneTouchPlayActionTest { 
        Looper looper = mTestLooper.getLooper();

        mHdmiControlService.setIoLooper(looper);

        mHdmiControlService.setHdmiCecConfig(mHdmiCecConfig);

        setHdmiControlEnabled(hdmiControlEnabled);

        mNativeWrapper = new FakeNativeWrapper();

        HdmiCecController hdmiCecController = HdmiCecController.createWithNativeWrapper(

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