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

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

Browse Source
This commit is contained in:
Michael Wright
2015-08-06 13:50:37 +00:00
committed by Android (Google) Code Review
parent a3b5a61271 2ccf0c8e63
commit eb7e3d7e45
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() { private boolean shouldDispatchInputWhenNonInteractive() {
// Send events to keyguard while the screen is on. if (mDisplay == null || mDisplay.getState() == Display.STATE_OFF) {
if (isKeyguardShowingAndNotOccluded() && mDisplay != null return false;
&& mDisplay.getState() != Display.STATE_OFF) { }
// Send events to keyguard while the screen is on and it's showing.
if (isKeyguardShowingAndNotOccluded()) {
return true; return true;
} }