From e67a0afc41c2c551a10976e65c92de5265cbfb40 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Thu, 23 Jul 2020 17:32:43 -0700 Subject: [PATCH] 3/n: verifyCredential no longer returns RequestThrottledException Bug: 161765592 Test: Accept/Reject/Lockout on the following 1) Owner profile 2) Managed profile with separate challenge 3) Managed profile with unified challenge Change-Id: Ia7b670a29e9e8ee1fe65bd09965a454601a06871 --- .../settings/password/ChooseLockPassword.java | 14 +++----------- .../settings/password/ChooseLockPattern.java | 13 +++---------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index bcf82125d4d..2e21004639d 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -968,17 +968,9 @@ public class ChooseLockPassword extends SettingsActivity { } Intent result = null; if (success && mHasChallenge) { - VerifyCredentialResponse response; - try { - response = mUtils.verifyCredential(mChosenPassword, mChallenge, mUserId, - 0 /* flags */); - } catch (RequestThrottledException e) { - response = null; - } - - if (response == null) { - Log.e(TAG, "critical: null response for known good password"); - } else if (!response.isMatched() || response.getGatekeeperHAT() == null) { + final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenPassword, + mChallenge, mUserId, 0 /* flags */); + if (!response.isMatched() || response.getGatekeeperHAT() == null) { Log.e(TAG, "critical: bad response or missing GK HAT for known good password: " + response.toString()); } diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index 8a51d5a7ae2..bf530969630 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -914,17 +914,10 @@ public class ChooseLockPattern extends SettingsActivity { } Intent result = null; if (success && mHasChallenge) { - VerifyCredentialResponse response; - try { - response = mUtils.verifyCredential(mChosenPattern, mChallenge, userId, - 0 /* flags */); - } catch (RequestThrottledException e) { - response = null; - } + final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenPattern, + mChallenge, userId, 0 /* flags */); - if (response == null) { - Log.e(TAG, "critial: null response for known good pattern"); - } else if (!response.isMatched() || response.getGatekeeperHAT() == null) { + if (!response.isMatched() || response.getGatekeeperHAT() == null) { Log.e(TAG, "critical: bad response or missing GK HAT for known good pattern: " + response.toString()); }