summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/keyguard
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2015-07-20 14:39:25 -0700
committerSelim Cinek <cinek@google.com>2015-07-23 15:27:32 -0700
commit1fcafc49ad34cb8f778862653d452ac0fe61461c (patch)
tree5f2a9e3029c0c18f89b70366a43fbb419637da4a /packages/SystemUI/src/com/android/systemui/keyguard
parenta2bf7616044051769df86cf5f0bb4b21dedd5269 (diff)
downloadframeworks_base-1fcafc49ad34cb8f778862653d452ac0fe61461c.zip
frameworks_base-1fcafc49ad34cb8f778862653d452ac0fe61461c.tar.gz
frameworks_base-1fcafc49ad34cb8f778862653d452ac0fe61461c.tar.bz2
Adapted the behavior when unlocking with fingerprint is not allowed
We now keep the fingerprint running and switch to the bouncer when the user successfully authenticated. Bug: 21618072 Change-Id: If00061cb3914afd4d7a7d75964594484c792a890
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java4
1 files changed, 3 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 c01a485..f595847 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -461,7 +461,9 @@ public class KeyguardViewMediator extends SystemUI {
@Override
public void onFingerprintAuthenticated(int userId, boolean wakeAndUnlocking) {
if (mStatusBarKeyguardViewManager.isBouncerShowing()) {
- mStatusBarKeyguardViewManager.notifyKeyguardAuthenticated();
+ if (mUpdateMonitor.isUnlockingWithFingerprintAllowed()) {
+ mStatusBarKeyguardViewManager.notifyKeyguardAuthenticated();
+ }
} else {
if (wakeAndUnlocking) {
mWakeAndUnlocking = true;