Merge "Follow-up to empty keyguard issue" into mnc-dev

2015-06-22 21:12:56 +00:00
parent c629271d48 61a7d1f5f6
commit 9622c0cc90
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -185,7 +185,7 @@ public class StatusBarKeyguardViewManager {
    }

    public void notifyScreenWakeUpRequested() {
-        mScreenWillWakeUp = true;
+        mScreenWillWakeUp = !mScreenOn;
    }

    public void verifyUnlock() {