diff options
| author | Joe LaPenna <jlapenna@google.com> | 2015-11-17 22:22:37 +0000 |
|---|---|---|
| committer | Joe LaPenna <jlapenna@google.com> | 2015-11-17 22:26:41 +0000 |
| commit | f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb (patch) | |
| tree | 0fd1a8374c6fed54a331e7ca253c9bdaa5505308 /services | |
| parent | 41ef58be3e5a968c58ed138861ab6a0f7ff013a6 (diff) | |
| download | frameworks_base-f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb.zip frameworks_base-f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb.tar.gz frameworks_base-f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb.tar.bz2 | |
Revert "Don't dispatch when non-interactive and the display is off."
This reverts commit 2ccf0c8e636fd3be75c3a07f4cf60d72a4cfaa28.
BUG: 22422588
BUG: 25067918
Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775
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; } |