Merge "Remove timeout from fingerprint generateChallenge" into sc-dev

This commit is contained in:
Ilya Matyukhin
2021-03-06 01:06:08 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 3 deletions

View File

@@ -32,7 +32,6 @@ import com.android.server.biometrics.sensors.GenerateChallengeClient;
*/ */
class FingerprintGenerateChallengeClient extends GenerateChallengeClient<ISession> { class FingerprintGenerateChallengeClient extends GenerateChallengeClient<ISession> {
private static final String TAG = "FingerprintGenerateChallengeClient"; private static final String TAG = "FingerprintGenerateChallengeClient";
private static final int CHALLENGE_TIMEOUT_SEC = 600; // 10 minutes
FingerprintGenerateChallengeClient(@NonNull Context context, FingerprintGenerateChallengeClient(@NonNull Context context,
@NonNull LazyDaemon<ISession> lazyDaemon, @NonNull LazyDaemon<ISession> lazyDaemon,
@@ -45,7 +44,7 @@ class FingerprintGenerateChallengeClient extends GenerateChallengeClient<ISessio
@Override @Override
protected void startHalOperation() { protected void startHalOperation() {
try { try {
getFreshDaemon().generateChallenge(mSequentialId, CHALLENGE_TIMEOUT_SEC); getFreshDaemon().generateChallenge(mSequentialId);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "Unable to generateChallenge", e); Slog.e(TAG, "Unable to generateChallenge", e);
} }

View File

@@ -45,7 +45,7 @@ public class TestHal extends IFingerprint.Stub {
return new ISession.Stub() { return new ISession.Stub() {
@Override @Override
public void generateChallenge(int cookie, int timeoutSec) throws RemoteException { public void generateChallenge(int cookie) throws RemoteException {
Slog.w(TAG, "generateChallenge, cookie: " + cookie); Slog.w(TAG, "generateChallenge, cookie: " + cookie);
cb.onChallengeGenerated(0L); cb.onChallengeGenerated(0L);
} }