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

Commit 1cc9bbbe authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Use real gatekeeper HAT for resetting lockout" into qt-r1-dev 

am: fbd90d3d

Change-Id: I45fc9c6f6e27dab8e47c4a7e98ccd6a02a3a5734
parents 77791e0c fbd90d3d

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

+2 −3
Original line number Diff line number Diff line
@@ -2548,9 +2548,8 @@ public class LockSettingsService extends ILockSettings.Stub { 
            // Reset lockout only if user has enrolled templates

            if (mInjector.hasEnrolledBiometrics()) {

                BiometricManager bm = mContext.getSystemService(BiometricManager.class);

                Slog.i(TAG, "Resetting lockout, length: "

                        + authResult.gkResponse.getPayload().length);

                bm.resetLockout(authResult.gkResponse.getPayload());

                Slog.i(TAG, "Resetting lockout, length: " + response.getPayload().length);

                bm.resetLockout(response.getPayload());



                if (!hasChallenge && pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {

                    mContext.getSystemService(FaceManager.class).revokeChallenge();