From 668cbc9635363b05655adb45b94bee524f304382 Mon Sep 17 00:00:00 2001 From: Nathalie Le Clair Date: Fri, 3 Apr 2020 09:59:47 +0200 Subject: [PATCH] Invoke One Touch Play on wakeUp for HDMI playback devices Change: Move OTP call from wakeUpFromPowerKey to wakeUp Result: On any HDMI playback device wake-up, the connected HDMI sink will turn on and display content Test: make, flash, home button key press on remote control results in OTP Bug: 151065016 Change-Id: I54e97deb4dee3a60c2725ec3b58aa89179ecbca2 --- .../android/server/policy/PhoneWindowManager.java | 12 ++++++------ 1 file 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 c9736401f680f..4624e9ea02098 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; }