From 1c9a06276adbb880bd878e7ec8f2eb052e2abbf0 Mon Sep 17 00:00:00 2001 From: Joe Bolinger Date: Thu, 3 Feb 2022 10:08:24 -0800 Subject: Remove face to fingerprint multi-sensor behavior. Refactor existing tests to remove unnecessary mocks and boilerplate code to cover more of the real behavior. This is prep for adding new tests in another change to add the new face and fingerprint behavior. Bug: 217393533 Test: atest AuthBiometricViewTest AuthContainerViewTest Test: manual (authenticate using test app) Change-Id: If984d1c07fee98d2d7a20cb0025ad434ad9977f4 --- core/java/android/hardware/biometrics/BiometricManager.java | 6 +++--- core/java/android/hardware/biometrics/IBiometricSysuiReceiver.aidl | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'core/java/android') diff --git a/core/java/android/hardware/biometrics/BiometricManager.java b/core/java/android/hardware/biometrics/BiometricManager.java index ada51559a38d..3f139f02efaf 100644 --- a/core/java/android/hardware/biometrics/BiometricManager.java +++ b/core/java/android/hardware/biometrics/BiometricManager.java @@ -104,16 +104,16 @@ public class BiometricManager { public static final int BIOMETRIC_MULTI_SENSOR_DEFAULT = 0; /** - * Prefer the face sensor and fall back to fingerprint when needed. + * Use face and fingerprint sensors together. * @hide */ - public static final int BIOMETRIC_MULTI_SENSOR_FACE_THEN_FINGERPRINT = 1; + public static final int BIOMETRIC_MULTI_SENSOR_FINGERPRINT_AND_FACE = 1; /** * @hide */ @IntDef({BIOMETRIC_MULTI_SENSOR_DEFAULT, - BIOMETRIC_MULTI_SENSOR_FACE_THEN_FINGERPRINT}) + BIOMETRIC_MULTI_SENSOR_FINGERPRINT_AND_FACE}) @Retention(RetentionPolicy.SOURCE) public @interface BiometricMultiSensorMode {} diff --git a/core/java/android/hardware/biometrics/IBiometricSysuiReceiver.aidl b/core/java/android/hardware/biometrics/IBiometricSysuiReceiver.aidl index 5d9b5f3bcc05..450c5ceab04c 100644 --- a/core/java/android/hardware/biometrics/IBiometricSysuiReceiver.aidl +++ b/core/java/android/hardware/biometrics/IBiometricSysuiReceiver.aidl @@ -30,6 +30,4 @@ oneway interface IBiometricSysuiReceiver { void onSystemEvent(int event); // Notifies that the dialog has finished animating. void onDialogAnimatedIn(); - // For multi-sensor devices, notifies that the fingerprint should start now. - void onStartFingerprintNow(); } -- cgit v1.2.3 From 4f75555ac1c93cda23476deaf35aa2a134f67b2e Mon Sep 17 00:00:00 2001 From: Joe Bolinger Date: Wed, 9 Feb 2022 20:44:31 -0800 Subject: Add Face and Fingerprint (Co-Ex) support to biometric prompt. Migrate simple views to Kotlin & remove useless test. Will add new tests in a follow up change. Bug: 217393533 Test: atest com.android.systemui.biometrics com.android.server.biometrics CommandQueueTest Test: manual (via BP test app) Change-Id: Ic8c80344d75f34f4b5f65ef14b61bbb5cddb0349 --- core/java/android/hardware/biometrics/IBiometricService.aidl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/java/android') diff --git a/core/java/android/hardware/biometrics/IBiometricService.aidl b/core/java/android/hardware/biometrics/IBiometricService.aidl index 2c3c8c353e8c..42aad36e44c1 100644 --- a/core/java/android/hardware/biometrics/IBiometricService.aidl +++ b/core/java/android/hardware/biometrics/IBiometricService.aidl @@ -63,7 +63,7 @@ interface IBiometricService { // Notify BiometricService when Service is ready to start the prepared client. // Client lifecycle is still managed in Service. - void onReadyForAuthentication(int cookie); + void onReadyForAuthentication(long requestId, int cookie); // Requests all BIOMETRIC_STRONG sensors to have their authenticatorId invalidated for the // specified user. This happens when enrollments have been added on devices with multiple -- cgit v1.2.3