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

Commit c03cfc9d authored by Bart Sears's avatar Bart Sears Committed by Android Git Automerger
Browse files

am d4c3ef87: am 4a26c391: Merge "CEC: Explicitly turn on screen for remote... 

am d4c3ef87: am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev

* commit 'd4c3ef87':
  CEC: Explicitly turn on screen for remote control passthrough
parents fb37c97c d4c3ef87

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

+13 −1
Original line number Diff line number Diff line
@@ -179,6 +179,13 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 
        }

    }



    @ServiceThreadOnly

    protected boolean handleUserControlPressed(HdmiCecMessage message) {

        assertRunOnServiceThread();

        wakeUpIfActiveSource();

        return super.handleUserControlPressed(message);

    }



    @Override

    @ServiceThreadOnly

    protected boolean handleSetStreamPath(HdmiCecMessage message) {
@@ -216,7 +223,12 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 
    }



    private void wakeUpIfActiveSource() {

        if (mIsActiveSource && mService.isPowerStandbyOrTransient()) {

        if (!mIsActiveSource) {

            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();

        }

    }