Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use CHALLENGE_NONE when VerifyCredential invoked with challenge=0

Browse Source 
LSS should generate a challenge if VerifyCredential is invoked
without a challenge. Otherwise, biometric lockout reset will not
work properly.

Bug: 153921881

Test: BiometricPromptDemo, allow device credential, enter password.
      Notice the added log, as well as generateChallenge, resetLockout,
      and revokeChallenge working now.
Change-Id: I0d24afa8b77f0b92b301c1ae53c3e6e8991a1335
This commit is contained in:
Kevin Chyn
2020-04-24 12:05:27 -07:00
parent 1e53024379
commit 3db0369fae
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -1972,7 +1972,13 @@ public class LockSettingsService extends ILockSettings.Stub {
public VerifyCredentialResponse verifyCredential(LockscreenCredential credential,
long challenge, int userId) {
checkPasswordReadPermission(userId);
return doVerifyCredential(credential, CHALLENGE_FROM_CALLER, challenge, userId,
@ChallengeType int challengeType = CHALLENGE_FROM_CALLER;
if (challenge == 0) {
Slog.w(TAG, "VerifyCredential called with challenge=0");
challengeType = CHALLENGE_NONE;
}
return doVerifyCredential(credential, challengeType, challenge, userId,
null /* progressCallback */);
}