Merge "Remove unused interfaces from Face/Fingerprint aidl" (e3e8ae90) · Commits · e / os / android_frameworks_base

core/java/android/hardware/face/IFaceService.aidl

+0 −9

Original line number	Diff line number	Diff line
		@@ -83,12 +83,6 @@ interface IFaceService {
		// Determine if a user has at least one enrolled face
		boolean hasEnrolledFaces(int userId, String opPackageName);

		// Gets the number of hardware devices
		// int getHardwareDeviceCount();

		// Gets the unique device id for hardware enumerated at i
		// long getHardwareDevice(int i);

		// Gets the authenticator ID for face
		long getAuthenticatorId();

		@@ -101,9 +95,6 @@ interface IFaceService {
		// Explicitly set the active user (for enrolling work profile)
		void setActiveUser(int uid);

		// Enumerate all faces
		void enumerate(IBinder token, int userId, IFaceServiceReceiver receiver);

		void setFeature(int userId, int feature, boolean enabled, in byte [] token,
		IFaceServiceReceiver receiver, String opPackageName);

+0 −23

Original line number	Diff line number	Diff line
		@@ -333,29 +333,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		public void onRemovalSucceeded(Fingerprint fp, int remaining) { }
		};

		/**
		* Callback structure provided to {@link FingerprintManager#enumerate(int, EnumerateCallback)}.
		* Users of{@link #FingerprintManager} may optionally provide an implementation of this to
		* {@link FingerprintManager#enumerate(int, EnumerateCallback)} for listening to
		* fingerprint template removal events.
		*
		* @hide
		*/
		public static abstract class EnumerateCallback {
		/**
		* Called when the given fingerprint can't be removed.
		* @param errMsgId An associated error message id
		* @param errString An error message indicating why the fingerprint id can't be removed
		*/
		public void onEnumerateError(int errMsgId, CharSequence errString) { }

		/**
		* Called when a given fingerprint is successfully removed.
		* @param fingerprint the fingerprint template that was removed.
		*/
		public void onEnumerate(Fingerprint fingerprint) { }
		};

		/**
		* @hide
		*/

+0 −9

Original line number	Diff line number	Diff line
		@@ -84,12 +84,6 @@ interface IFingerprintService {
		// Determine if a user has at least one enrolled fingerprint
		boolean hasEnrolledFingerprints(int groupId, String opPackageName);

		// Gets the number of hardware devices
		// int getHardwareDeviceCount();

		// Gets the unique device id for hardware enumerated at i
		// long getHardwareDevice(int i);

		// Gets the authenticator ID for fingerprint
		long getAuthenticatorId();

		@@ -102,9 +96,6 @@ interface IFingerprintService {
		// Explicitly set the active user (for enrolling work profile)
		void setActiveUser(int uid);

		// Enumerate all fingerprints
		void enumerate(IBinder token, int userId, IFingerprintServiceReceiver receiver);

		// Check if a client request is currently being handled
		boolean isClientActive();

+0 −18

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ import com.android.server.biometrics.BiometricServiceBase;
		import com.android.server.biometrics.BiometricUtils;
		import com.android.server.biometrics.ClientMonitor;
		import com.android.server.biometrics.Constants;
		import com.android.server.biometrics.EnumerateClient;
		import com.android.server.biometrics.RemovalClient;

		import org.json.JSONArray;
		@@ -519,23 +518,6 @@ public class FaceService extends BiometricServiceBase {
		removeInternal(client);
		}

		@Override
		public void enumerate(final IBinder token, final int userId,
		final IFaceServiceReceiver receiver) {
		checkPermission(MANAGE_BIOMETRIC);

		final boolean restricted = isRestricted();
		final EnumerateClient client = new EnumerateClient(getContext(), getConstants(),
		mDaemonWrapper, token, new ServiceListenerImpl(receiver), userId,
		userId, restricted, getContext().getOpPackageName()) {
		@Override
		protected int statsModality() {
		return FaceService.this.statsModality();
		}
		};
		enumerateInternal(client);
		}

		@Override
		public void addLockoutResetCallback(final IBiometricServiceLockoutResetCallback callback)
		throws RemoteException {

+0 −18

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ import com.android.server.biometrics.AuthenticationClient;
		import com.android.server.biometrics.BiometricServiceBase;
		import com.android.server.biometrics.BiometricUtils;
		import com.android.server.biometrics.Constants;
		import com.android.server.biometrics.EnumerateClient;
		import com.android.server.biometrics.RemovalClient;

		import org.json.JSONArray;
		@@ -320,23 +319,6 @@ public class FingerprintService extends BiometricServiceBase {
		removeInternal(client);
		}

		@Override // Binder call
		public void enumerate(final IBinder token, final int userId,
		final IFingerprintServiceReceiver receiver) {
		checkPermission(MANAGE_FINGERPRINT);

		final boolean restricted = isRestricted();
		final EnumerateClient client = new EnumerateClient(getContext(), getConstants(),
		mDaemonWrapper, token, new ServiceListenerImpl(receiver), userId,
		userId, restricted, getContext().getOpPackageName()) {
		@Override
		protected int statsModality() {
		return FingerprintService.this.statsModality();
		}
		};
		enumerateInternal(client);
		}

		@Override
		public void addLockoutResetCallback(final IBiometricServiceLockoutResetCallback callback)
		throws RemoteException {