| commit | 9622c0cc900da84c903f0395053dd4d9a9e4f53d | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <[email protected]> | Mon Jun 22 21:12:56 2015 +0000 |
| committer | Android (Google) Code Review <[email protected]> | Mon Jun 22 21:12:57 2015 +0000 |
| tree | 5238322a23342b8176a5a8d8c6c503567b9339db | |
| parent | c629271d480ea618fd3b9ae2c6ff3028b2a1732d [diff] | |
| parent | 61a7d1f5f6963a55cb519ef7364e9e7ca4059584 [diff] |
Merge "Follow-up to empty keyguard issue" into mnc-dev
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 1c74378..a7e8406 100644 --- 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 void notifyScreenWakeUpRequested() { - mScreenWillWakeUp = true; + mScreenWillWakeUp = !mScreenOn; } public void verifyUnlock() {