diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index f595847..7d72dab 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -460,15 +460,20 @@ public class KeyguardViewMediator extends SystemUI { @Override public void onFingerprintAuthenticated(int userId, boolean wakeAndUnlocking) { + boolean unlockingWithFingerprintAllowed = + mUpdateMonitor.isUnlockingWithFingerprintAllowed(); if (mStatusBarKeyguardViewManager.isBouncerShowing()) { - if (mUpdateMonitor.isUnlockingWithFingerprintAllowed()) { + if (unlockingWithFingerprintAllowed) { mStatusBarKeyguardViewManager.notifyKeyguardAuthenticated(); } } else { - if (wakeAndUnlocking) { + if (wakeAndUnlocking && unlockingWithFingerprintAllowed) { mWakeAndUnlocking = true; keyguardDone(true, true); } else { + if (wakeAndUnlocking) { + mStatusBarKeyguardViewManager.notifyScreenWakeUpRequested(); + } mStatusBarKeyguardViewManager.animateCollapsePanels( FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR); } |