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

am: fbd90d3dec

Change-Id: I45fc9c6f6e27dab8e47c4a7e98ccd6a02a3a5734
This commit is contained in:
Kevin Chyn
2019-06-05 15:26:04 -07:00
committed by android-build-merger

View File

@@ -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();