diff options
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index c9736401f680..4624e9ea0209 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -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; } |