[LockSettings] pipe through HW throttle timeout

Bug: 21118563
Change-Id: I23f5af2ebef9dac981281fb04c055a02f3b159b8

1 files changed, 8 insertions, 8 deletions

diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 8ae2824..c7d1f27 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -248,7 +248,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                 return;
             }
 
-            onPasswordChecked(false, intent);
+            onPasswordChecked(false, intent, 0);
         }
 
         private boolean isInternalActivity() {
@@ -265,7 +265,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                     UserHandle.myUserId(),
                     new LockPatternChecker.OnVerifyCallback() {
                         @Override
-                        public void onVerified(byte[] token) {
+                        public void onVerified(byte[] token, int timeoutMs) {
                             mPendingLockCheck = null;
                             boolean matched = false;
                             if (token != null) {
@@ -274,7 +274,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                                         ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
                                         token);
                             }
-                            onPasswordChecked(matched, intent);
+                            onPasswordChecked(matched, intent, timeoutMs);
                         }
                     });
         }
@@ -286,7 +286,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                     UserHandle.myUserId(),
                     new LockPatternChecker.OnCheckCallback() {
                         @Override
-                        public void onChecked(boolean matched) {
+                        public void onChecked(boolean matched, int timeoutMs) {
                             mPendingLockCheck = null;
                             if (matched && isInternalActivity()) {
                                 intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
@@ -295,20 +295,20 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                                 intent.putExtra(
                                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pin);
                             }
-                            onPasswordChecked(matched, intent);
+                            onPasswordChecked(matched, intent, timeoutMs);
                         }
                     });
         }
 
-        private void onPasswordChecked(boolean matched, Intent intent) {
+        private void onPasswordChecked(boolean matched, Intent intent, int timeoutMs) {
             mPasswordEntryInputDisabler.setInputEnabled(true);
             if (matched) {
                 getActivity().setResult(RESULT_OK, intent);
                 getActivity().finish();
             } else {
-                if (++mNumWrongConfirmAttempts >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) {
+                if (timeoutMs > 0) {
                     long deadline = mLockPatternUtils.setLockoutAttemptDeadline(
-                            UserHandle.myUserId());
+                            UserHandle.myUserId(), timeoutMs);
                     handleAttemptLockout(deadline);
                 } else {
                     showError(getErrorMessage());