diff options
author | Selim Cinek <cinek@google.com> | 2015-07-25 01:54:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 01:54:26 +0000 |
commit | e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029 (patch) | |
tree | 435dc953671b5f723a7054adfb598a3ca973ff45 /packages/SystemUI | |
parent | b6c6e45a04a52a7ece08dd63636b1f71e7322653 (diff) | |
parent | d9f1a0c3a42bcc1f7b8cd82be8eed60f5438f091 (diff) | |
download | frameworks_base-e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029.zip frameworks_base-e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029.tar.gz frameworks_base-e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029.tar.bz2 |
am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
* commit 'd9f1a0c3a42bcc1f7b8cd82be8eed60f5438f091':
Fixed wake to unlock when the device has never been unlocked
Diffstat (limited to 'packages/SystemUI')
-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); } |