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

Commit c00a6cb9 authored by Donghyun Cho's avatar Donghyun Cho Committed by Android (Google) Code Review
Browse files

Merge "CEC: Check standby action availability before request for sleep mode" into nyc-mr1-dev

parents 742b0a7d 02920a08

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

+7 −1
Original line number Diff line number Diff line
@@ -2011,6 +2011,9 @@ public final class HdmiControlService extends SystemService { 
    @ServiceThreadOnly

    void standby() {

        assertRunOnServiceThread();

        if (!canGoToStandby()) {

            return;

        }

        mStandbyMessageReceived = true;

        mPowerManager.goToSleep(SystemClock.uptimeMillis(), PowerManager.GO_TO_SLEEP_REASON_HDMI, 0);

        // PowerManger will send the broadcast Intent.ACTION_SCREEN_OFF and after this gets
@@ -2038,10 +2041,13 @@ public final class HdmiControlService extends SystemService { 
    @ServiceThreadOnly

    private void onStandby(final int standbyAction) {

        assertRunOnServiceThread();

        if (!canGoToStandby()) return;

        mPowerStatus = HdmiControlManager.POWER_STATUS_TRANSIENT_TO_STANDBY;

        invokeVendorCommandListenersOnControlStateChanged(false,

                HdmiControlManager.CONTROL_STATE_CHANGED_REASON_STANDBY);

        if (!canGoToStandby()) {

            mPowerStatus = HdmiControlManager.POWER_STATUS_STANDBY;

            return;

        }



        final List<HdmiCecLocalDevice> devices = getAllLocalDevices();

        disableDevices(new PendingActionClearedCallback() {