am 9622c0cc: Merge "Follow-up to empty keyguard issue" into mnc-dev

* commit '9622c0cc900da84c903f0395053dd4d9a9e4f53d': Follow-up to empty keyguard issue
2015-06-22 21:20:25 +00:00
parent 421daf8590 9622c0cc90
commit 1bbbb645d5
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() {