From f6abe19a7cdf8ee14501d0daf05ba135973e6211 Mon Sep 17 00:00:00 2001 From: Nathalie Le Clair Date: Thu, 17 Sep 2020 10:33:17 +0200 Subject: [PATCH] Remove OTP calls on wake-up from PhoneWindowManager OTP is now invoked on every wake-up from HdmiControlService, in response to an ACTION_SCREEN_ON broadcast. Therefore the explicit call to OTP on wake-up is redundant. OTP still needs to be invoked explicitely on a HOME button press, since that doesn't always result in wake-up. Bug: 167961841 Test: atest HdmiCecLocalDevicePlaybackTest and manual tests that wake keys and power button still trigger OTP. Change-Id: I91f467d6b9968a565dc29441e5f67a5bbd9fa2dd (cherry picked from commit 4b72eb799cdc7aa5bfc1d8d85091889e4b347f85) --- .../java/com/android/server/policy/PhoneWindowManager.java | 6 ------ 1 file changed, 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 1e4907140fa28..d0aa28b441a0d 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -4251,12 +4251,6 @@ 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; }