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

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

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

parents f7066203 b3219ef7

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

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

    }