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

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

Merge "Invoke One Touch Play on wakeUp for HDMI playback devices" into rvc-dev... 

Merge "Invoke One Touch Play on wakeUp for HDMI playback devices" into rvc-dev am: a018ca00 am: 19cfbd2b am: 81d3640f

Change-Id: I87b5cf28670c2f53ed9ae694d5cac17d6377a185
parents f035d7a2 81d3640f

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −6
Original line number Diff line number Diff line
@@ -4468,12 +4468,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    private void wakeUpFromPowerKey(long eventTime) {

        wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey,

                PowerManager.WAKE_REASON_POWER_BUTTON, "android.policy:POWER");



        // Turn on the connected TV and switch HDMI input if we're a HDMI playback device.

        final HdmiControl hdmiControl = getHdmiControl();

        if (hdmiControl != null) {

            hdmiControl.turnOnTv();

        }

    }



    private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode, @WakeReason int reason,
@@ -4489,6 +4483,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }



        mPowerManager.wakeUp(wakeTime, reason, details);



        // Turn on the connected TV and switch HDMI input if we're a HDMI playback device.

        final HdmiControl hdmiControl = getHdmiControl();

        if (hdmiControl != null) {

            hdmiControl.turnOnTv();

        }

        return true;

    }