From f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb Mon Sep 17 00:00:00 2001 From: Joe LaPenna Date: Tue, 17 Nov 2015 22:22:37 +0000 Subject: [PATCH] Revert "Don't dispatch when non-interactive and the display is off." This reverts commit 2ccf0c8e636fd3be75c3a07f4cf60d72a4cfaa28. BUG: 22422588 BUG: 25067918 Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775 --- .../com/android/server/policy/PhoneWindowManager.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index ace2505073616..0cbf614e45a84 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -5265,11 +5265,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { } private boolean shouldDispatchInputWhenNonInteractive() { - if (mDisplay == null || mDisplay.getState() == Display.STATE_OFF) { - return false; - } - // Send events to keyguard while the screen is on and it's showing. - if (isKeyguardShowingAndNotOccluded()) { + // Send events to keyguard while the screen is on. + if (isKeyguardShowingAndNotOccluded() && mDisplay != null + && mDisplay.getState() != Display.STATE_OFF) { return true; }