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

Commit 19e81e4d authored by Nathalie Le Clair's avatar Nathalie Le Clair
Browse files

Exit dream mode on CEC wake message received 

Bug: 183945838
Test: atest
Change-Id: I45c925e6fbba2b510482bb686d88294cadcc400f
parent 385414ee

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

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

    protected boolean handleSetMenuLanguage(HdmiCecMessage message) {

        assertRunOnServiceThread();

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

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,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;

    }