diff options
| author | Joe LaPenna <jlapenna@google.com> | 2015-11-17 22:32:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-17 22:32:57 +0000 |
| commit | f7aceb60e3e0d6ec611b3fa2dd64e6e4e1196f4c (patch) | |
| tree | f1184564860537e063d351e09538d3c1aaabe740 /services | |
| parent | 8aa7e6a21a3428741159de2e28d87acb8b420e96 (diff) | |
| parent | f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb (diff) | |
| download | frameworks_base-f7aceb60e3e0d6ec611b3fa2dd64e6e4e1196f4c.zip frameworks_base-f7aceb60e3e0d6ec611b3fa2dd64e6e4e1196f4c.tar.gz frameworks_base-f7aceb60e3e0d6ec611b3fa2dd64e6e4e1196f4c.tar.bz2 | |
Revert "Don\'t dispatch when non-interactive and the display is off."
am: f2b9b2d85a
* commit 'f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb':
Revert "Don't dispatch when non-interactive and the display is off."
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 8 |
1 files 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 ace2505..0cbf614 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; } |