Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a36baf7e authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Use CHALLENGE_NONE when VerifyCredential invoked with challenge=0" into... 

Merge "Use CHALLENGE_NONE when VerifyCredential invoked with challenge=0" into rvc-dev am: 27f4c791 am: 1731d517

Change-Id: I780d20ad08d0db327a564ced48fdd57c121a2dcc
parents 1f3fa889 1731d517

services/core/java/com/android/server/locksettings/LockSettingsService.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -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 */);

    }

    }