Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dd7d74d authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Added default method to Fingerprint21" into sc-dev am: 8155ef9e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13454973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1e7824c48db7e241f52baeed478bc4c70de7684
parents 424c40b6 8155ef9e

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

+2 −5
Original line number Diff line number Diff line
@@ -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);

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

+12 −0
Original line number Diff line number Diff line
@@ -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;
@@ -780,6 +781,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 =