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

am: b04ec7f756

Change-Id: I6b7a34c359adb6b5e5863e16648bafe597da4bd9
This commit is contained in:
Lucas Dupin
2019-09-04 01:02:39 -07:00
committed by android-build-merger

View File

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