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

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

Browse Source 
* commit 'eb7e3d7e456177f7848834759b9a7f6f78a05f7a':
  Don't dispatch when non-interactive and the display is off.
This commit is contained in:
Michael Wright
2015-08-06 13:58:01 +00:00
committed by Android Git Automerger
parent c694ab3284 eb7e3d7e45
commit 44a14ef7b4
1 changed files with 5 additions and 3 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

@@ -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;
}