diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index da8fb702a56e9..c4ff277945a20 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -5229,9 +5229,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { } private boolean shouldDispatchInputWhenNonInteractive() { - // Send events to keyguard while the screen is on. - if (isKeyguardShowingAndNotOccluded() && mDisplay != null - && mDisplay.getState() != Display.STATE_OFF) { + 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()) { return true; }