Revert^2 "Update RemovalClient to support new biometric AIDL" (e0552feb) · Commits · e / os / android_frameworks_base

core/java/android/hardware/face/FaceManager.java

+17 −6

Original line number	Diff line number	Diff line
		@@ -574,14 +574,25 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		mService.remove(mToken, face.getBiometricId(), userId, mServiceReceiver,
		mContext.getOpPackageName());
		} catch (RemoteException e) {
		Slog.w(TAG, "Remote exception in remove: ", e);
		if (callback != null) {
		callback.onRemovalError(face, FACE_ERROR_HW_UNAVAILABLE,
		getErrorString(mContext, FACE_ERROR_HW_UNAVAILABLE,
		0 /* vendorCode */));
		throw e.rethrowFromSystemServer();
		}
		}
		}

		/**
		* Removes all face templates for the given user.
		* @hide
		*/
		@RequiresPermission(MANAGE_BIOMETRIC)
		public void removeAll(int userId, @NonNull RemovalCallback callback) {
		if (mService != null) {
		try {
		mRemovalCallback = callback;
		mService.removeAll(mToken, userId, mServiceReceiver, mContext.getOpPackageName());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

		/**

+4 −1

Original line number	Diff line number	Diff line
		@@ -83,10 +83,13 @@ interface IFaceService {
		// Cancel enrollment in progress
		void cancelEnrollment(IBinder token);

		// Any errors resulting from this call will be returned to the listener
		// Removes the specified face enrollment for the specified userId.
		void remove(IBinder token, int faceId, int userId, IFaceServiceReceiver receiver,
		String opPackageName);

		// Removes all face enrollments for the specified userId.
		void removeAll(IBinder token, int userId, IFaceServiceReceiver receiver, String opPackageName);

		// Get the enrolled face for user.
		List<Face> getEnrolledFaces(int sensorId, int userId, String opPackageName);

+16 −5

Original line number	Diff line number	Diff line
		@@ -739,11 +739,22 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		mService.remove(mToken, fp.getBiometricId(), userId, mServiceReceiver,
		mContext.getOpPackageName());
		} catch (RemoteException e) {
		Slog.w(TAG, "Remote exception in remove: ", e);
		if (callback != null) {
		callback.onRemovalError(fp, FINGERPRINT_ERROR_HW_UNAVAILABLE,
		getErrorString(mContext, FINGERPRINT_ERROR_HW_UNAVAILABLE,
		0 /* vendorCode */));
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Removes all face templates for the given user.
		* @hide
		*/
		@RequiresPermission(MANAGE_FINGERPRINT)
		public void removeAll(int userId, @NonNull RemovalCallback callback) {
		if (mService != null) {
		try {
		mRemovalCallback = callback;
		mService.removeAll(mToken, userId, mServiceReceiver, mContext.getOpPackageName());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,9 @@ interface IFingerprintService {
		void remove(IBinder token, int fingerId, int userId, IFingerprintServiceReceiver receiver,
		String opPackageName);

		// Removes all face enrollments for the specified userId.
		void removeAll(IBinder token, int userId, IFingerprintServiceReceiver receiver, String opPackageName);

		// Rename the fingerprint specified by fingerId and userId to the given name
		void rename(int fingerId, int userId, String name);

+3 −4

Original line number	Diff line number	Diff line
		@@ -37,18 +37,16 @@ public abstract class RemovalClient<S extends BiometricAuthenticator.Identifier,

		private static final String TAG = "Biometrics/RemovalClient";

		protected final int mBiometricId;
		private final BiometricUtils<S> mBiometricUtils;
		private final Map<Integer, Long> mAuthenticatorIds;

		public RemovalClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,
		@NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener,
		int biometricId, int userId, @NonNull String owner, @NonNull BiometricUtils<S> utils,
		int sensorId, @NonNull Map<Integer, Long> authenticatorIds, int statsModality) {
		int userId, @NonNull String owner, @NonNull BiometricUtils<S> utils, int sensorId,
		@NonNull Map<Integer, Long> authenticatorIds, int statsModality) {
		super(context, lazyDaemon, token, listener, userId, owner, 0 /* cookie */, sensorId,
		statsModality, BiometricsProtoEnums.ACTION_REMOVE,
		BiometricsProtoEnums.CLIENT_UNKNOWN);
		mBiometricId = biometricId;
		mBiometricUtils = utils;
		mAuthenticatorIds = authenticatorIds;
		}
		@@ -68,6 +66,7 @@ public abstract class RemovalClient<S extends BiometricAuthenticator.Identifier,

		@Override
		public void onRemoved(@Nullable BiometricAuthenticator.Identifier identifier, int remaining) {
		Slog.d(TAG, "onRemoved: " + identifier.getBiometricId() + " remaining: " + remaining);
		if (identifier != null) {
		mBiometricUtils.removeBiometricForUser(getContext(), getTargetUserId(),
		identifier.getBiometricId());