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

2/n: Save new authenticatorId in invalidationClient

Browse Source 
Bug: 159667191
Test: Builds
Change-Id: Ic9cab78e58299d14baf5480d09a766c7da124c28
This commit is contained in:
Kevin Chyn
2021-01-11 13:00:26 -08:00
parent 5d0b527570
commit 259f778bfd
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 */);
}

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

@@ -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

6
services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInvalidationClient.java
View File

@@ -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