Merge "Don't dispatch when non-interactive and the display is off." into mnc-dev

2015-08-06 13:50:37 +00:00
parent a3b5a61271 2ccf0c8e63
commit eb7e3d7e45
1 changed files with 5 additions and 3 deletions
--- 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;
        }