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

Commit 43591f3b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exit dream mode on CEC wake message received" into sc-dev am: a31ca4d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14466779

Change-Id: I4e0a9a684bf4da361df91db78d76f4bced970bb0
parents 020034fb a31ca4d9

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

+0 −12
Original line number Diff line number Diff line
@@ -266,18 +266,6 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        return super.handleUserControlPressed(message);

    }



    @Override

    protected void wakeUpIfActiveSource() {

        if (!isActiveSource()) {

            return;

        }

        // Wake up the device if the power is in standby mode, or its screen is off -

        // which can happen if the device is holding a partial lock.

        if (mService.isPowerStandbyOrTransient() || !mService.getPowerManager().isScreenOn()) {

            mService.wakeUp();

        }

    }



    @ServiceThreadOnly

    @Constants.HandleMessageResult

    protected int handleSetMenuLanguage(HdmiCecMessage message) {

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

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
        if (!isActiveSource()) {

            return;

        }

        // Wake up the device

        // Wake up the device. This will also exit dream mode.

        mService.wakeUp();

        return;

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -3030,6 +3030,7 @@ public class HdmiControlService extends SystemService { 
    @ServiceThreadOnly

    @VisibleForTesting

    protected void onStandby(final int standbyAction) {

        mWakeUpMessageReceived = false;

        assertRunOnServiceThread();

        mPowerStatusController.setPowerStatus(HdmiControlManager.POWER_STATUS_TRANSIENT_TO_STANDBY,

                false);

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

+21 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@ public class HdmiCecLocalDevicePlaybackTest { 
                        return false;

                    }



                    @Override

                    boolean isPowerStandbyOrTransient() {

                        return false;

                    }



                    @Override

                    protected PowerManager getPowerManager() {

                        return new PowerManager(context, mIPowerManagerMock,
@@ -1381,6 +1386,22 @@ public class HdmiCecLocalDevicePlaybackTest { 
        assertThat(mHdmiCecLocalDevicePlayback.isActiveSource()).isTrue();

    }



    @Test

    public void handleSetStreamPath_Dreaming() throws RemoteException {

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



        mWokenUp = false;



        HdmiCecMessage message =

                HdmiCecMessageBuilder.buildSetStreamPath(ADDR_TV,

                        mPlaybackPhysicalAddress);



        assertThat(mHdmiCecLocalDevicePlayback.handleSetStreamPath(message))

                .isEqualTo(Constants.HANDLED);

        mTestLooper.dispatchAll();

        assertThat(mWokenUp).isTrue();

    }



    @Test

    public void handleSetStreamPath_otherDevice_None() {

        mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(