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

Commit 17f87aee 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: ab05512e 

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

Change-Id: Ida0484a6e5a079c13443531837b1b203bedef5f5
parents bf269f23 ab05512e

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

+0 −12
Original line number Diff line number Diff line
@@ -258,18 +258,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
@@ -372,7 +372,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;

    }