diff options
3 files changed, 16 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java b/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java index b8084d5135bf..fe946cb0189d 100644 --- a/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java @@ -21,6 +21,8 @@ import android.content.Context; import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.BiometricsProtoEnums; +import java.util.Map; + /** * ClientMonitor subclass for requesting authenticatorId invalidation. See * {@link InvalidationRequesterClient} for more info. @@ -29,18 +31,21 @@ public abstract class InvalidationClient<S extends BiometricAuthenticator.Identi extends ClientMonitor<T> { private final BiometricUtils<S> mUtils; + private final Map<Integer, Long> mAuthenticatorIds; public InvalidationClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon, - int userId, int sensorId, @NonNull BiometricUtils<S> utils) { + int userId, int sensorId, @NonNull BiometricUtils<S> utils, + @NonNull Map<Integer, Long> authenticatorIds) { super(context, lazyDaemon, null /* token */, null /* listener */, userId, context.getOpPackageName(), 0 /* cookie */, sensorId, BiometricsProtoEnums.MODALITY_UNKNOWN, BiometricsProtoEnums.ACTION_UNKNOWN, BiometricsProtoEnums.CLIENT_UNKNOWN); mUtils = utils; + mAuthenticatorIds = authenticatorIds; } public void onAuthenticatorIdInvalidated(long newAuthenticatorId) { - // TODO: Update framework w/ newAuthenticatorId + mAuthenticatorIds.put(getTargetUserId(), newAuthenticatorId); mCallback.onClientFinished(this, true /* success */); } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClient.java index f512cef80d95..9c6438ecd014 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClient.java @@ -16,10 +16,9 @@ package com.android.server.biometrics.sensors.face.aidl; +import android.annotation.NonNull; import android.content.Context; import android.hardware.biometrics.face.ISession; - -import android.annotation.NonNull; import android.hardware.face.Face; import android.os.RemoteException; import android.util.Slog; @@ -27,13 +26,15 @@ import android.util.Slog; import com.android.server.biometrics.sensors.InvalidationClient; import com.android.server.biometrics.sensors.face.FaceUtils; +import java.util.Map; + public class FaceInvalidationClient extends InvalidationClient<Face, ISession> { private static final String TAG = "FaceInvalidationClient"; public FaceInvalidationClient(@NonNull Context context, @NonNull LazyDaemon<ISession> lazyDaemon, int userId, int sensorId, - @NonNull FaceUtils utils) { - super(context, lazyDaemon, userId, sensorId, utils); + @NonNull FaceUtils utils, @NonNull Map<Integer, Long> authenticatorIds) { + super(context, lazyDaemon, userId, sensorId, utils, authenticatorIds); } @Override diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInvalidationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInvalidationClient.java index b6d8892c4874..3d07334f04a1 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInvalidationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInvalidationClient.java @@ -26,13 +26,15 @@ import android.util.Slog; import com.android.server.biometrics.sensors.InvalidationClient; import com.android.server.biometrics.sensors.fingerprint.FingerprintUtils; +import java.util.Map; + public class FingerprintInvalidationClient extends InvalidationClient<Fingerprint, ISession> { private static final String TAG = "FingerprintInvalidationClient"; public FingerprintInvalidationClient(@NonNull Context context, @NonNull LazyDaemon<ISession> lazyDaemon, int userId, int sensorId, - @NonNull FingerprintUtils utils) { - super(context, lazyDaemon, userId, sensorId, utils); + @NonNull FingerprintUtils utils, @NonNull Map<Integer, Long> authenticatorIds) { + super(context, lazyDaemon, userId, sensorId, utils, authenticatorIds); } @Override |