am 304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev

* commit '304e3772273cd39ae55fbdc1c453d8fa50258670': Fix wrong mode for fingerprint unlock when bouncer not showing
2015-09-02 20:54:42 +00:00
parent 93e6673856 304e377227
commit ac2b543be6
1 changed files with 1 additions and 1 deletions
--- 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;
            }
        }