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

This commit is contained in:
Jorim Jaggi
2015-09-02 20:43:04 +00:00
committed by Android (Google) Code Review

View File

@@ -227,7 +227,7 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback {
return MODE_DISMISS_BOUNCER; return MODE_DISMISS_BOUNCER;
} else if (unlockingAllowed) { } else if (unlockingAllowed) {
return MODE_UNLOCK; return MODE_UNLOCK;
} else { } else if (!mStatusBarKeyguardViewManager.isBouncerShowing()) {
return MODE_SHOW_BOUNCER; return MODE_SHOW_BOUNCER;
} }
} }