Fixed stopped countdown when PIN entered incorrect.

When device is locked CountDownTimer.onFinish() is not called
after countdown finished. Thus some logic was copied to onResume().

BUG:28160696
Change-Id: I1906e7ab2202b437b909afc12b7b3628692a00f1

diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index ca4be6c..a1bc3dd 100644 (file)
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -267,6 +267,11 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                 handleAttemptLockout(deadline);
             } else {
                 resetState();
+                mErrorTextView.setText("");
+                if (isProfileChallenge()) {
+                    updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
+                            mEffectiveUserId));
+                }
             }
             mCredentialCheckResultTracker.setListener(this);
         }