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

Merge "Use CHALLENGE_NONE when VerifyCredential invoked with challenge=0" into rvc-dev

Browse Source
This commit is contained in:
Kevin Chyn
2020-05-05 21:31:28 +00:00
committed by Android (Google) Code Review
parent 9e2fa5042b 1cd2160cc9
commit 27f4c791a2
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, public VerifyCredentialResponse verifyCredential(LockscreenCredential credential,
long challenge, int userId) { long challenge, int userId) {
checkPasswordReadPermission(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 */); null /* progressCallback */);
} }