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 am: 27f4c791a2

Browse Source 
Change-Id: I2eca80a272177ba2ce4d3f259756e804b8b01192
This commit is contained in:
Kevin Chyn
2020-05-05 21:42:17 +00:00
committed by Automerger Merge Worker
parent 3839f1f669 27f4c791a2
commit 1d62b78bab
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 */);
} }