Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move synchronous generateChallenge to implementation-specific classes"

Browse Source
This commit is contained in:
Kevin Chyn
2020-10-03 00:04:12 +00:00
committed by Android (Google) Code Review
parent e3c1e22e32 0b24037d67
commit f4732f2181
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/biometrics/sensors/GenerateChallengeClient.java
View File

@@ -27,8 +27,6 @@ public abstract class GenerateChallengeClient<T> extends ClientMonitor<T> {
private static final String TAG = "GenerateChallengeClient";
protected long mChallenge;
public GenerateChallengeClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,
@NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener,
@NonNull String owner, int sensorId) {
@@ -51,12 +49,5 @@ public abstract class GenerateChallengeClient<T> extends ClientMonitor<T> {
super.start(callback);
startHalOperation();
try {
getListener().onChallengeGenerated(getSensorId(), mChallenge);
mCallback.onClientFinished(this, true /* success */);
} catch (RemoteException e) {
Slog.e(TAG, "Remote exception", e);
mCallback.onClientFinished(this, false /* success */);
}
}
}

9
services/core/java/com/android/server/biometrics/sensors/face/FaceGenerateChallengeClient.java
View File

@@ -59,7 +59,14 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<IBiomet
@Override
protected void startHalOperation() {
try {
mChallenge = getFreshDaemon().generateChallenge(CHALLENGE_TIMEOUT_SEC).value;
final long challenge = getFreshDaemon().generateChallenge(CHALLENGE_TIMEOUT_SEC).value;
try {
getListener().onChallengeGenerated(getSensorId(), challenge);
mCallback.onClientFinished(this, true /* success */);
} catch (RemoteException e) {
Slog.e(TAG, "Remote exception", e);
mCallback.onClientFinished(this, false /* success */);
}
} catch (RemoteException e) {
Slog.e(TAG, "generateChallenge failed", e);
}

9
services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintGenerateChallengeClient.java
View File

@@ -45,7 +45,14 @@ public class FingerprintGenerateChallengeClient
@Override
protected void startHalOperation() {
try {
mChallenge = getFreshDaemon().preEnroll();
final long challenge = getFreshDaemon().preEnroll();
try {
getListener().onChallengeGenerated(getSensorId(), challenge);
mCallback.onClientFinished(this, true /* success */);
} catch (RemoteException e) {
Slog.e(TAG, "Remote exception", e);
mCallback.onClientFinished(this, false /* success */);
}
} catch (RemoteException e) {
Slog.e(TAG, "preEnroll failed", e);
}