From a6fb46621b1c9375b51333e7ebe2126636d69126 Mon Sep 17 00:00:00 2001 From: Oleksandr Peletskyi Date: Thu, 14 Apr 2016 19:35:04 +0200 Subject: [PATCH] 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 --- src/com/android/settings/ConfirmLockPassword.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java index ca4be6cd8e..a1bc3ddb04 100644 --- 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); } -- 2.11.0