3/n: verifyCredential no longer returns RequestThrottledException am: e67a0afc41

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12222935

Change-Id: If8b089662ebcd3a4253287d14c5d652cb2331adf
This commit is contained in:
Kevin Chyn
2020-08-08 00:10:09 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 21 deletions

View File

@@ -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());
}

View File

@@ -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());
}