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

This commit is contained in:
Kevin Chyn
2019-06-04 22:14:05 +00:00
committed by Android (Google) Code Review

View File

@@ -2548,9 +2548,8 @@ public class LockSettingsService extends ILockSettings.Stub {
// Reset lockout only if user has enrolled templates // Reset lockout only if user has enrolled templates
if (mInjector.hasEnrolledBiometrics()) { if (mInjector.hasEnrolledBiometrics()) {
BiometricManager bm = mContext.getSystemService(BiometricManager.class); BiometricManager bm = mContext.getSystemService(BiometricManager.class);
Slog.i(TAG, "Resetting lockout, length: " Slog.i(TAG, "Resetting lockout, length: " + response.getPayload().length);
+ authResult.gkResponse.getPayload().length); bm.resetLockout(response.getPayload());
bm.resetLockout(authResult.gkResponse.getPayload());
if (!hasChallenge && pm.hasSystemFeature(PackageManager.FEATURE_FACE)) { if (!hasChallenge && pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {
mContext.getSystemService(FaceManager.class).revokeChallenge(); mContext.getSystemService(FaceManager.class).revokeChallenge();