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

* commit 'b991034d3e45276f03f719ba24c98daf65870407':
  Fix wrong mode for fingerprint unlock when bouncer not showing
This commit is contained in:
Jorim Jaggi
2015-09-03 06:22:48 +00:00
committed by Android Git Automerger

View File

@@ -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;
}
}