PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3/n: verifyCredential no longer returns RequestThrottledException

Browse Source 
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
This commit is contained in:
Kevin Chyn
2020-07-23 17:32:43 -07:00
parent fbc2ec831f
commit e67a0afc41
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -968,17 +968,9 @@ public class ChooseLockPassword extends SettingsActivity {
} }
Intent result = null; Intent result = null;
if (success && mHasChallenge) { if (success && mHasChallenge) {
VerifyCredentialResponse response; final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenPassword,
try { mChallenge, mUserId, 0 /* flags */);
response = mUtils.verifyCredential(mChosenPassword, mChallenge, mUserId, if (!response.isMatched() || response.getGatekeeperHAT() == null) {
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) {
Log.e(TAG, "critical: bad response or missing GK HAT for known good password: " Log.e(TAG, "critical: bad response or missing GK HAT for known good password: "
+ response.toString()); + response.toString());
} }

13
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -914,17 +914,10 @@ public class ChooseLockPattern extends SettingsActivity {
} }
Intent result = null; Intent result = null;
if (success && mHasChallenge) { if (success && mHasChallenge) {
VerifyCredentialResponse response; final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenPattern,
try { mChallenge, userId, 0 /* flags */);
response = mUtils.verifyCredential(mChosenPattern, mChallenge, userId,
0 /* flags */);
} catch (RequestThrottledException e) {
response = null;
}
if (response == null) { if (!response.isMatched() || response.getGatekeeperHAT() == null) {
Log.e(TAG, "critial: null response for known good pattern");
} else if (!response.isMatched() || response.getGatekeeperHAT() == null) {
Log.e(TAG, "critical: bad response or missing GK HAT for known good pattern: " Log.e(TAG, "critical: bad response or missing GK HAT for known good pattern: "
+ response.toString()); + response.toString());
} }