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

Merge "Added default method to Fingerprint21" into sc-dev

Browse Source
This commit is contained in:
Joshua Mccloskey
2021-02-02 23:19:48 +00:00
committed by Android (Google) Code Review
parent 8101a510e9 d6ca0d3086
commit 8155ef9ea1
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,11 +114,8 @@ public interface ServiceProvider {
* Requests for the authenticatorId (whose source of truth is in the TEE or equivalent) to
* be invalidated. See {@link com.android.server.biometrics.sensors.InvalidationRequesterClient}
*/
default void scheduleInvalidateAuthenticatorId(int sensorId, int userId,
@NonNull IInvalidationCallback callback) {
throw new IllegalStateException("Providers that support invalidation must override"
+ " this method");
}
void scheduleInvalidateAuthenticatorId(int sensorId, int userId,
@NonNull IInvalidationCallback callback);
long getAuthenticatorId(int sensorId, int userId);

12
services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
View File

@@ -28,6 +28,7 @@ import android.content.pm.UserInfo;
import android.hardware.biometrics.BiometricConstants;
import android.hardware.biometrics.BiometricManager;
import android.hardware.biometrics.BiometricsProtoEnums;
import android.hardware.biometrics.IInvalidationCallback;
import android.hardware.biometrics.ITestSession;
import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;
import android.hardware.biometrics.fingerprint.V2_2.IBiometricsFingerprintClientCallback;
@@ -779,6 +780,17 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
tracker.clear();
}
@Override
public void scheduleInvalidateAuthenticatorId(int sensorId, int userId,
@NonNull IInvalidationCallback callback) {
// TODO (b/179101888): Remove this temporary workaround.
try {
callback.onCompleted();
} catch (RemoteException e) {
Slog.e(TAG, "Failed to complete InvalidateAuthenticatorId");
}
}
@Override
public void dumpInternal(int sensorId, @NonNull PrintWriter pw) {
PerformanceTracker performanceTracker =