diff options
| author | Selim Cinek <cinek@google.com> | 2014-09-03 14:18:09 +0200 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2014-09-03 14:18:09 +0200 |
| commit | 7ff6eb6429ae3b0facc93214acefd657d378f4da (patch) | |
| tree | 8eb2f7fd627c1cec93c2f1d9977657e8d937c8e1 /packages/SystemUI/src/com/android/systemui/keyguard | |
| parent | b2da91b14fb8ad15a74d171a298649e8cb6322bb (diff) | |
| download | frameworks_base-7ff6eb6429ae3b0facc93214acefd657d378f4da.zip frameworks_base-7ff6eb6429ae3b0facc93214acefd657d378f4da.tar.gz frameworks_base-7ff6eb6429ae3b0facc93214acefd657d378f4da.tar.bz2 | |
Correctly forwarding the screen off event on lockscreen
Bug: 17364635
Change-Id: I88730238e3622522674268438d266fd2334410cd
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index f4d0669..54c2c09 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -581,6 +581,8 @@ public class KeyguardViewMediator extends SystemUI { final boolean lockImmediately = mLockPatternUtils.getPowerButtonInstantlyLocks() || !mLockPatternUtils.isSecure(); + notifyScreenOffLocked(); + if (mExitSecureCallback != null) { if (DEBUG) Log.d(TAG, "pending exit secure callback cancelled"); try { @@ -593,7 +595,6 @@ public class KeyguardViewMediator extends SystemUI { hideLocked(); } } else if (mShowing) { - notifyScreenOffLocked(); resetStateLocked(); } else if (why == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT || (why == WindowManagerPolicy.OFF_BECAUSE_OF_USER && !lockImmediately)) { |