Merge "Add sensorId to IFingerprintService#authenticate" (ed128abf) · Commits · e / os / android_frameworks_base

core/java/android/hardware/fingerprint/FingerprintManager.java

+29 −5

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static android.Manifest.permission.USE_BIOMETRIC;
		import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;
		import static android.Manifest.permission.USE_FINGERPRINT;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresFeature;
		@@ -55,6 +56,8 @@ import android.security.identity.IdentityCredential;
		import android.util.Slog;
		import android.view.Surface;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.security.Signature;
		import java.util.ArrayList;
		import java.util.List;
		@@ -87,6 +90,19 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		private static final int MSG_CHALLENGE_GENERATED = 106;
		private static final int MSG_FINGERPRINT_DETECTED = 107;

		/**
		* Request authentication with any single sensor.
		* @hide
		*/
		public static final int SENSOR_ID_ANY = -1;

		/**
		* @hide
		*/
		@IntDef({SENSOR_ID_ANY})
		@Retention(RetentionPolicy.SOURCE)
		public @interface SensorId {}

		private IFingerprintService mService;
		private Context mContext;
		private IBinder mToken = new Binder();
		@@ -461,15 +477,23 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		}

		/**
		* Per-user version, see {@link FingerprintManager#authenticate(CryptoObject,
		* CancellationSignal, int, AuthenticationCallback, Handler)}. This version does not
		* display the BiometricPrompt.
		* @param userId the user ID that the fingerprint hardware will authenticate for.
		* Per-user version of authenticate.
		* @hide
		*/
		@RequiresPermission(anyOf = {USE_BIOMETRIC, USE_FINGERPRINT})
		public void authenticate(@Nullable CryptoObject crypto, @Nullable CancellationSignal cancel,
		@NonNull AuthenticationCallback callback, Handler handler, int userId) {
		authenticate(crypto, cancel, callback, handler, SENSOR_ID_ANY, userId);
		}

		/**
		* Per-user and per-sensor version of authenticate.
		* @hide
		*/
		@RequiresPermission(anyOf = {USE_BIOMETRIC, USE_FINGERPRINT})
		public void authenticate(@Nullable CryptoObject crypto, @Nullable CancellationSignal cancel,
		@NonNull AuthenticationCallback callback, Handler handler, @SensorId int sensorId,
		int userId) {
		if (callback == null) {
		throw new IllegalArgumentException("Must supply an authentication callback");
		}
		@@ -489,7 +513,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		mAuthenticationCallback = callback;
		mCryptoObject = crypto;
		final long operationId = crypto != null ? crypto.getOpId() : 0;
		mService.authenticate(mToken, operationId, userId, mServiceReceiver,
		mService.authenticate(mToken, operationId, sensorId, userId, mServiceReceiver,
		mContext.getOpPackageName());
		} catch (RemoteException e) {
		Slog.w(TAG, "Remote exception while authenticating: ", e);

core/java/android/hardware/fingerprint/IFingerprintService.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ interface IFingerprintService {
		// Authenticate the given sessionId with a fingerprint. This is protected by
		// USE_FINGERPRINT/USE_BIOMETRIC permission. This is effectively deprecated, since it only comes
		// through FingerprintManager now.
		void authenticate(IBinder token, long operationId, int userId,
		void authenticate(IBinder token, long operationId, int sensorId, int userId,
		IFingerprintServiceReceiver receiver, String opPackageName);

		// Uses the fingerprint hardware to detect for the presence of a finger, without giving details

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -2141,7 +2141,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		userId);
		} else {
		mFpm.authenticate(null /* crypto */, mFingerprintCancelSignal,
		mFingerprintAuthenticationCallback, null /* handler */, userId);
		mFingerprintAuthenticationCallback, null /* handler */,
		FingerprintManager.SENSOR_ID_ANY, userId);
		}
		setFingerprintRunningState(BIOMETRIC_STATE_RUNNING);
		}

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -448,7 +448,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		mKeyguardUpdateMonitor.dispatchStartedGoingToSleep(0 /* why */);
		mTestableLooper.processAllMessages();

		verify(mFingerprintManager).authenticate(any(), any(), any(), any(), anyInt());
		verify(mFingerprintManager).authenticate(any(), any(), any(), any(), anyInt(), anyInt());
		verify(mFingerprintManager, never()).detectFingerprint(any(), any(), anyInt());
		}

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import android.hardware.biometrics.ITestSession;
		import android.hardware.biometrics.fingerprint.IFingerprint;
		import android.hardware.biometrics.fingerprint.SensorProps;
		import android.hardware.fingerprint.Fingerprint;
		import android.hardware.fingerprint.FingerprintManager;
		import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
		import android.hardware.fingerprint.IFingerprintClientActiveCallback;
		import android.hardware.fingerprint.IFingerprintService;
		@@ -215,8 +216,10 @@ public class FingerprintService extends SystemService implements BiometricServic
		provider.second.cancelEnrollment(provider.first, token);
		}

		@SuppressWarnings("deprecation")
		@Override // Binder call
		public void authenticate(final IBinder token, final long operationId, final int userId,
		public void authenticate(final IBinder token, final long operationId,
		@FingerprintManager.SensorId final int sensorId, final int userId,
		final IFingerprintServiceReceiver receiver, final String opPackageName) {
		final int callingUid = Binder.getCallingUid();
		final int callingPid = Binder.getCallingPid();
		@@ -251,7 +254,13 @@ public class FingerprintService extends SystemService implements BiometricServic
		final int statsClient = isKeyguard ? BiometricsProtoEnums.CLIENT_KEYGUARD
		: BiometricsProtoEnums.CLIENT_FINGERPRINT_MANAGER;

		final Pair<Integer, ServiceProvider> provider = getSingleProvider();
		final Pair<Integer, ServiceProvider> provider;
		if (sensorId == FingerprintManager.SENSOR_ID_ANY) {
		provider = getSingleProvider();
		} else {
		Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL);
		provider = new Pair<>(sensorId, getProviderForSensor(sensorId));
		}
		if (provider == null) {
		Slog.w(TAG, "Null provider for authenticate");
		return;