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

Merge "Fix onClientFinished for generate and revoke challenge" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-30 05:49:48 +00:00
committed by Android (Google) Code Review
parent c6de6e418a c091528fcc
commit c5f6938ac6
9 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/biometrics/sensors/RevokeChallengeClient.java
View File

@@ -42,7 +42,6 @@ public abstract class RevokeChallengeClient<T> extends HalClientMonitor<T> {
super.start(callback);
startHalOperation();
mCallback.onClientFinished(this, true /* success */);
}
@Override

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

@@ -45,6 +45,7 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISessio
getFreshDaemon().generateChallenge();
} catch (RemoteException e) {
Slog.e(TAG, "Unable to generateChallenge", e);
mCallback.onClientFinished(this, false /* success */);
}
}

1
services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceRevokeChallengeClient.java
View File

@@ -48,6 +48,7 @@ public class FaceRevokeChallengeClient extends RevokeChallengeClient<ISession> {
getFreshDaemon().revokeChallenge(mChallenge);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to revokeChallenge", e);
mCallback.onClientFinished(this, false /* success */);
}
}

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

@@ -67,6 +67,7 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<IBiomet
}
} catch (RemoteException e) {
Slog.e(TAG, "generateChallenge failed", e);
mCallback.onClientFinished(this, false /* success */);
}
}
}

2
services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRevokeChallengeClient.java
View File

@@ -43,8 +43,10 @@ public class FaceRevokeChallengeClient extends RevokeChallengeClient<IBiometrics
protected void startHalOperation() {
try {
getFreshDaemon().revokeChallenge();
mCallback.onClientFinished(this, true /* success */);
} catch (RemoteException e) {
Slog.e(TAG, "revokeChallenge failed", e);
mCallback.onClientFinished(this, false /* success */);
}
}
}

7
services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java
View File

@@ -47,18 +47,17 @@ class FingerprintGenerateChallengeClient extends GenerateChallengeClient<ISessio
getFreshDaemon().generateChallenge();
} catch (RemoteException e) {
Slog.e(TAG, "Unable to generateChallenge", e);
mCallback.onClientFinished(this, false /* success */);
}
}
void onChallengeGenerated(int sensorId, int userId, long challenge) {
try {
getListener().onChallengeGenerated(sensorId, challenge);
mCallback.onClientFinished(FingerprintGenerateChallengeClient.this,
true /* success */);
mCallback.onClientFinished(this, true /* success */);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to send challenge", e);
mCallback.onClientFinished(FingerprintGenerateChallengeClient.this,
false /* success */);
mCallback.onClientFinished(this, false /* success */);
}
}
}

1
services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintRevokeChallengeClient.java
View File

@@ -48,6 +48,7 @@ class FingerprintRevokeChallengeClient extends RevokeChallengeClient<ISession> {
getFreshDaemon().revokeChallenge(mChallenge);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to revokeChallenge", e);
mCallback.onClientFinished(this, false /* success */);
}
}

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

@@ -55,6 +55,7 @@ public class FingerprintGenerateChallengeClient
}
} catch (RemoteException e) {
Slog.e(TAG, "preEnroll failed", e);
mCallback.onClientFinished(this, false /* success */);
}
}
}

2
services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintRevokeChallengeClient.java
View File

@@ -45,8 +45,10 @@ public class FingerprintRevokeChallengeClient
protected void startHalOperation() {
try {
getFreshDaemon().postEnroll();
mCallback.onClientFinished(this, true /* success */);
} catch (RemoteException e) {
Slog.e(TAG, "revokeChallenge/postEnroll failed", e);
mCallback.onClientFinished(this, false /* success */);
}
}
}