Merge "Do not shake the padlock until there's an error" into qt-qpr1-dev

This commit is contained in:
TreeHugger Robot
2019-09-04 07:51:21 +00:00
committed by Android (Google) Code Review

View File

@@ -650,7 +650,6 @@ public class KeyguardIndicationController implements StateListener,
if (!updateMonitor.isUnlockingWithBiometricAllowed()) { if (!updateMonitor.isUnlockingWithBiometricAllowed()) {
return; return;
} }
animatePadlockError();
boolean showSwipeToUnlock = boolean showSwipeToUnlock =
msgId == KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED; msgId == KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED;
if (mStatusBarKeyguardViewManager.isBouncerShowing()) { if (mStatusBarKeyguardViewManager.isBouncerShowing()) {