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

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

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

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

Change-Id: I8c15c8c0debd4de3f33331698cd28cbad6b47b27
parents 06af41d4 b95c1dab

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

+12 −0
Original line number Diff line number Diff line
@@ -257,6 +257,18 @@ 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
@@ -371,7 +371,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
        if (!isActiveSource()) {

            return;

        }

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

        // Wake up the device

        mService.wakeUp();

        return;

    }