Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a

Browse Source 
am: f7aceb60e3

* commit 'f7aceb60e3e0d6ec611b3fa2dd64e6e4e1196f4c':
  Revert "Don't dispatch when non-interactive and the display is off."
This commit is contained in:
Joe LaPenna
2015-11-17 22:41:46 +00:00
committed by android-build-merger
parent 78f974a0b2 f7aceb60e3
commit 2900dc2349
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -5265,11 +5265,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
private boolean shouldDispatchInputWhenNonInteractive() { private boolean shouldDispatchInputWhenNonInteractive() {
if (mDisplay == null || mDisplay.getState() == Display.STATE_OFF) { // Send events to keyguard while the screen is on.
return false; if (isKeyguardShowingAndNotOccluded() && mDisplay != null
} && mDisplay.getState() != Display.STATE_OFF) {
// Send events to keyguard while the screen is on and it's showing.
if (isKeyguardShowingAndNotOccluded()) {
return true; return true;
} }