Merge changes from topic "biometric-id" (6f843d42) · Commits · e / os / android_frameworks_base

core/java/android/hardware/biometrics/IBiometricSensorReceiver.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -24,10 +24,10 @@ oneway interface IBiometricSensorReceiver {
		// the auth token must be submitted into KeyStore.
		void onAuthenticationSucceeded(int sensorId, in byte[] token);
		// Notify BiometricService authentication was rejected.
		void onAuthenticationFailed();
		void onAuthenticationFailed(int sensorId);
		// Notify BiometricService than an error has occured. Forward to the correct receiver depending
		// on the cookie.
		void onError(int cookie, int modality, int error, int vendorCode);
		void onError(int sensorId, int cookie, int error, int vendorCode);
		// Notifies that a biometric has been acquired.
		void onAcquired(int acquiredInfo, String message);
		void onAcquired(int sensorId, int acquiredInfo, String message);
		}

core/java/android/hardware/biometrics/IBiometricServiceLockoutResetCallback.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,5 +26,5 @@ oneway interface IBiometricServiceLockoutResetCallback {
		/**
		* A wakelock will be held until the reciever calls back into {@param callback}
		*/
		void onLockoutReset(long deviceId, IRemoteCallback callback);
		void onLockoutReset(IRemoteCallback callback);
		}

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

+15 −26

Original line number	Diff line number	Diff line
		@@ -84,42 +84,34 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		private IFaceServiceReceiver mServiceReceiver = new IFaceServiceReceiver.Stub() {

		@Override // binder call
		public void onEnrollResult(long deviceId, int faceId, int remaining) {
		mHandler.obtainMessage(MSG_ENROLL_RESULT, remaining, 0,
		new Face(null, faceId, deviceId)).sendToTarget();
		public void onEnrollResult(Face face, int remaining) {
		mHandler.obtainMessage(MSG_ENROLL_RESULT, remaining, 0, face).sendToTarget();
		}

		@Override // binder call
		public void onAcquired(long deviceId, int acquireInfo, int vendorCode) {
		mHandler.obtainMessage(MSG_ACQUIRED, acquireInfo, vendorCode, deviceId).sendToTarget();
		public void onAcquired(int acquireInfo, int vendorCode) {
		mHandler.obtainMessage(MSG_ACQUIRED, acquireInfo, vendorCode).sendToTarget();
		}

		@Override // binder call
		public void onAuthenticationSucceeded(long deviceId, Face face, int userId,
		boolean isStrongBiometric) {
		public void onAuthenticationSucceeded(Face face, int userId, boolean isStrongBiometric) {
		mHandler.obtainMessage(MSG_AUTHENTICATION_SUCCEEDED, userId, isStrongBiometric ? 1 : 0,
		face).sendToTarget();
		}

		@Override // binder call
		public void onAuthenticationFailed(long deviceId) {
		public void onAuthenticationFailed() {
		mHandler.obtainMessage(MSG_AUTHENTICATION_FAILED).sendToTarget();
		}

		@Override // binder call
		public void onError(long deviceId, int error, int vendorCode) {
		mHandler.obtainMessage(MSG_ERROR, error, vendorCode, deviceId).sendToTarget();
		public void onError(int error, int vendorCode) {
		mHandler.obtainMessage(MSG_ERROR, error, vendorCode).sendToTarget();
		}

		@Override // binder call
		public void onRemoved(long deviceId, int faceId, int remaining) {
		mHandler.obtainMessage(MSG_REMOVED, remaining, 0,
		new Face(null, faceId, deviceId)).sendToTarget();
		}

		@Override
		public void onEnumerated(long deviceId, int faceId, int remaining) {
		// TODO: Finish. Low priority since it's not used.
		public void onRemoved(Face face, int remaining) {
		mHandler.obtainMessage(MSG_REMOVED, remaining, 0, face).sendToTarget();
		}

		@Override
		@@ -593,8 +585,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		new IBiometricServiceLockoutResetCallback.Stub() {

		@Override
		public void onLockoutReset(long deviceId,
		IRemoteCallback serverCallback)
		public void onLockoutReset(IRemoteCallback serverCallback)
		throws RemoteException {
		try {
		final PowerManager.WakeLock wakeLock = powerManager.newWakeLock(
		@@ -1043,8 +1034,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		sendEnrollResult((Face) msg.obj, msg.arg1 /* remaining */);
		break;
		case MSG_ACQUIRED:
		sendAcquiredResult((Long) msg.obj /* deviceId /, msg.arg1 / acquire info */,
		msg.arg2 /* vendorCode */);
		sendAcquiredResult(msg.arg1 /* acquire info /, msg.arg2 / vendorCode */);
		break;
		case MSG_AUTHENTICATION_SUCCEEDED:
		sendAuthenticatedSucceeded((Face) msg.obj, msg.arg1 /* userId */,
		@@ -1054,8 +1044,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		sendAuthenticatedFailed();
		break;
		case MSG_ERROR:
		sendErrorResult((Long) msg.obj /* deviceId /, msg.arg1 / errMsgId */,
		msg.arg2 /* vendorCode */);
		sendErrorResult(msg.arg1 /* errMsgId /, msg.arg2 / vendorCode */);
		break;
		case MSG_REMOVED:
		sendRemovedResult((Face) msg.obj, msg.arg1 /* remaining */);
		@@ -1103,7 +1092,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		mRemovalCallback.onRemovalSucceeded(face, remaining);
		}

		private void sendErrorResult(long deviceId, int errMsgId, int vendorCode) {
		private void sendErrorResult(int errMsgId, int vendorCode) {
		// emulate HAL 2.1 behavior and send real errMsgId
		final int clientErrMsgId = errMsgId == FACE_ERROR_VENDOR
		? (vendorCode + FACE_ERROR_VENDOR_BASE) : errMsgId;
		@@ -1139,7 +1128,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		}
		}

		private void sendAcquiredResult(long deviceId, int acquireInfo, int vendorCode) {
		private void sendAcquiredResult(int acquireInfo, int vendorCode) {
		if (mAuthenticationCallback != null) {
		mAuthenticationCallback.onAuthenticationAcquired(acquireInfo);
		}

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

+6 −8

Original line number	Diff line number	Diff line
		@@ -22,14 +22,12 @@ import android.hardware.face.Face;
		* @hide
		*/
		oneway interface IFaceServiceReceiver {
		void onEnrollResult(long deviceId, int faceId, int remaining);
		void onAcquired(long deviceId, int acquiredInfo, int vendorCode);
		void onAuthenticationSucceeded(long deviceId, in Face face, int userId,
		boolean isStrongBiometric);
		void onAuthenticationFailed(long deviceId);
		void onError(long deviceId, int error, int vendorCode);
		void onRemoved(long deviceId, int faceId, int remaining);
		void onEnumerated(long deviceId, int faceId, int remaining);
		void onEnrollResult(in Face face, int remaining);
		void onAcquired(int acquiredInfo, int vendorCode);
		void onAuthenticationSucceeded(in Face face, int userId, boolean isStrongBiometric);
		void onAuthenticationFailed();
		void onError(int error, int vendorCode);
		void onRemoved(in Face face, int remaining);
		void onFeatureSet(boolean success, int feature);
		void onFeatureGet(boolean success, int feature, boolean value);
		}

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

+15 −63

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		private static final int MSG_AUTHENTICATION_FAILED = 103;
		private static final int MSG_ERROR = 104;
		private static final int MSG_REMOVED = 105;
		private static final int MSG_ENUMERATED = 106;

		private IFingerprintService mService;
		private Context mContext;
		@@ -83,7 +82,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		private AuthenticationCallback mAuthenticationCallback;
		private EnrollmentCallback mEnrollmentCallback;
		private RemovalCallback mRemovalCallback;
		private EnumerateCallback mEnumerateCallback;
		private CryptoObject mCryptoObject;
		private Fingerprint mRemovalFingerprint;
		private Handler mHandler;
		@@ -610,29 +608,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		}
		}

		/**
		* Enumerate all fingerprint templates stored in hardware and/or protected storage.
		* @param userId the user who this fingerprint belongs to
		* @param callback an optional callback to verify that fingerprint templates have been
		* successfully removed. May be null of no callback is required.
		*
		* @hide
		*/
		@RequiresPermission(MANAGE_FINGERPRINT)
		public void enumerate(int userId, @NonNull EnumerateCallback callback) {
		if (mService != null) try {
		mEnumerateCallback = callback;
		mService.enumerate(mToken, userId, mServiceReceiver);
		} catch (RemoteException e) {
		Slog.w(TAG, "Remote exception in enumerate: ", e);
		if (callback != null) {
		callback.onEnumerateError(FINGERPRINT_ERROR_HW_UNAVAILABLE,
		getErrorString(mContext, FINGERPRINT_ERROR_HW_UNAVAILABLE,
		0 /* vendorCode */));
		}
		}
		}

		/**
		* Renames the given fingerprint template
		* @param fpId the fingerprint id
		@@ -768,7 +743,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		new IBiometricServiceLockoutResetCallback.Stub() {

		@Override
		public void onLockoutReset(long deviceId, IRemoteCallback serverCallback)
		public void onLockoutReset(IRemoteCallback serverCallback)
		throws RemoteException {
		try {
		final PowerManager.WakeLock wakeLock = powerManager.newWakeLock(
		@@ -810,7 +785,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		sendEnrollResult((Fingerprint) msg.obj, msg.arg1 /* remaining */);
		break;
		case MSG_ACQUIRED:
		sendAcquiredResult((Long) msg.obj /* deviceId /, msg.arg1 / acquire info */,
		sendAcquiredResult(msg.arg1 /* acquire info */,
		msg.arg2 /* vendorCode */);
		break;
		case MSG_AUTHENTICATION_SUCCEEDED:
		@@ -821,16 +796,11 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		sendAuthenticatedFailed();
		break;
		case MSG_ERROR:
		sendErrorResult((Long) msg.obj /* deviceId /, msg.arg1 / errMsgId */,
		msg.arg2 /* vendorCode */);
		sendErrorResult(msg.arg1 /* errMsgId /, msg.arg2 / vendorCode */);
		break;
		case MSG_REMOVED:
		sendRemovedResult((Fingerprint) msg.obj, msg.arg1 /* remaining */);
		break;
		case MSG_ENUMERATED:
		sendEnumeratedResult((Long) msg.obj /* deviceId /, msg.arg1 / fingerId */,
		msg.arg2 /* groupId */);
		break;
		}
		}
		};
		@@ -860,12 +830,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		mRemovalCallback.onRemovalSucceeded(fingerprint, remaining);
		}

		private void sendEnumeratedResult(long deviceId, int fingerId, int groupId) {
		if (mEnumerateCallback != null) {
		mEnumerateCallback.onEnumerate(new Fingerprint(null, groupId, fingerId, deviceId));
		}
		}

		private void sendEnrollResult(Fingerprint fp, int remaining) {
		if (mEnrollmentCallback != null) {
		mEnrollmentCallback.onEnrollmentProgress(remaining);
		@@ -886,7 +850,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		}
		}

		private void sendAcquiredResult(long deviceId, int acquireInfo, int vendorCode) {
		private void sendAcquiredResult(int acquireInfo, int vendorCode) {
		if (mAuthenticationCallback != null) {
		mAuthenticationCallback.onAuthenticationAcquired(acquireInfo);
		}
		@@ -906,7 +870,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		}
		}

		private void sendErrorResult(long deviceId, int errMsgId, int vendorCode) {
		private void sendErrorResult(int errMsgId, int vendorCode) {
		// emulate HAL 2.1 behavior and send real errMsgId
		final int clientErrMsgId = errMsgId == FINGERPRINT_ERROR_VENDOR
		? (vendorCode + FINGERPRINT_ERROR_VENDOR_BASE) : errMsgId;
		@@ -919,9 +883,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		} else if (mRemovalCallback != null) {
		mRemovalCallback.onRemovalError(mRemovalFingerprint, clientErrMsgId,
		getErrorString(mContext, errMsgId, vendorCode));
		} else if (mEnumerateCallback != null) {
		mEnumerateCallback.onEnumerateError(clientErrMsgId,
		getErrorString(mContext, errMsgId, vendorCode));
		}
		}

		@@ -1048,44 +1009,35 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		private IFingerprintServiceReceiver mServiceReceiver = new IFingerprintServiceReceiver.Stub() {

		@Override // binder call
		public void onEnrollResult(long deviceId, int fingerId, int groupId, int remaining) {
		mHandler.obtainMessage(MSG_ENROLL_RESULT, remaining, 0,
		new Fingerprint(null, groupId, fingerId, deviceId)).sendToTarget();
		public void onEnrollResult(Fingerprint fp, int remaining) {
		mHandler.obtainMessage(MSG_ENROLL_RESULT, remaining, 0, fp).sendToTarget();
		}

		@Override // binder call
		public void onAcquired(long deviceId, int acquireInfo, int vendorCode) {
		mHandler.obtainMessage(MSG_ACQUIRED, acquireInfo, vendorCode,
		deviceId).sendToTarget();
		public void onAcquired(int acquireInfo, int vendorCode) {
		mHandler.obtainMessage(MSG_ACQUIRED, acquireInfo, vendorCode).sendToTarget();
		}

		@Override // binder call
		public void onAuthenticationSucceeded(long deviceId, Fingerprint fp, int userId,
		public void onAuthenticationSucceeded(Fingerprint fp, int userId,
		boolean isStrongBiometric) {
		mHandler.obtainMessage(MSG_AUTHENTICATION_SUCCEEDED, userId, isStrongBiometric ? 1 : 0,
		fp).sendToTarget();
		}

		@Override // binder call
		public void onAuthenticationFailed(long deviceId) {
		public void onAuthenticationFailed() {
		mHandler.obtainMessage(MSG_AUTHENTICATION_FAILED).sendToTarget();
		}

		@Override // binder call
		public void onError(long deviceId, int error, int vendorCode) {
		mHandler.obtainMessage(MSG_ERROR, error, vendorCode, deviceId).sendToTarget();
		}

		@Override // binder call
		public void onRemoved(long deviceId, int fingerId, int groupId, int remaining) {
		mHandler.obtainMessage(MSG_REMOVED, remaining, 0,
		new Fingerprint(null, groupId, fingerId, deviceId)).sendToTarget();
		public void onError(int error, int vendorCode) {
		mHandler.obtainMessage(MSG_ERROR, error, vendorCode).sendToTarget();
		}

		@Override // binder call
		public void onEnumerated(long deviceId, int fingerId, int groupId, int remaining) {
		// TODO: propagate remaining
		mHandler.obtainMessage(MSG_ENUMERATED, fingerId, groupId, deviceId).sendToTarget();
		public void onRemoved(Fingerprint fp, int remaining) {
		mHandler.obtainMessage(MSG_REMOVED, remaining, 0, fp).sendToTarget();
		}
		};