summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-09-02 11:53:02 -0700
committerJorim Jaggi <jjaggi@google.com>2015-09-02 11:53:02 -0700
commitbf04cf51e6dbf6608cf45aa6eac874c98488d16e (patch)
tree3e40fbcc860b5da347f10a178bdd958c81e9f895 /packages/SystemUI/src/com
parent363c694a448d90322936526d78a9878de0003d0e (diff)
downloadframeworks_base-bf04cf51e6dbf6608cf45aa6eac874c98488d16e.zip
frameworks_base-bf04cf51e6dbf6608cf45aa6eac874c98488d16e.tar.gz
frameworks_base-bf04cf51e6dbf6608cf45aa6eac874c98488d16e.tar.bz2
Fix wrong mode for fingerprint unlock when bouncer not showing
Bug: 23748205 Change-Id: I4c751fcbb99d1f409a1433309e795addf1a2232c
Diffstat (limited to 'packages/SystemUI/src/com')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
index 4e69999..84082db 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
@@ -227,7 +227,7 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback {
return MODE_DISMISS_BOUNCER;
} else if (unlockingAllowed) {
return MODE_UNLOCK;
- } else {
+ } else if (!mStatusBarKeyguardViewManager.isBouncerShowing()) {
return MODE_SHOW_BOUNCER;
}
}