Always play haptic on UDFPS reject.
Bug: 195161518
Test: atest CoexCoordinatorTest
Change-Id: I259d30b20fe613b4f15067d20379dc6c63d774b6
diff --git a/services/core/java/com/android/server/biometrics/sensors/CoexCoordinator.java b/services/core/java/com/android/server/biometrics/sensors/CoexCoordinator.java
index 5aa9b79..c8a90e7 100644
--- a/services/core/java/com/android/server/biometrics/sensors/CoexCoordinator.java
+++ b/services/core/java/com/android/server/biometrics/sensors/CoexCoordinator.java
@@ -92,7 +92,7 @@
void sendHapticFeedback();
}
- private static CoexCoordinator sInstance;
+ private static final CoexCoordinator sInstance = new CoexCoordinator();
@VisibleForTesting
public static class SuccessfulAuth {
@@ -147,14 +147,9 @@
}
}
- /**
- * @return a singleton instance.
- */
+ /** The singleton instance. */
@NonNull
public static CoexCoordinator getInstance() {
- if (sInstance == null) {
- sInstance = new CoexCoordinator();
- }
return sInstance;
}
@@ -339,18 +334,8 @@
auth.mCallback.sendHapticFeedback();
auth.mCallback.sendAuthenticationResult(true /* addAuthTokenIfStrong */);
auth.mCallback.handleLifecycleAfterAuth();
- } else if (isFaceScanning()) {
- // UDFPS rejected but face is still scanning
- Slog.d(TAG, "UDFPS rejected in multi-sensor auth, face: " + face);
- callback.handleLifecycleAfterAuth();
-
- // TODO(b/193089985): Enforce/ensure that face auth finishes (whether
- // accept/reject) within X amount of time. Otherwise users will be stuck
- // waiting with their finger down for a long time.
} else {
- // Face not scanning, and was not found in the queue. Most likely, face
- // auth was too long ago.
- Slog.d(TAG, "UDFPS rejected in multi-sensor auth, face not scanning");
+ Slog.d(TAG, "UDFPS rejected in multi-sensor auth");
callback.sendHapticFeedback();
callback.handleLifecycleAfterAuth();
}
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/CoexCoordinatorTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/CoexCoordinatorTest.java
index f40b31a..abf992b 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/CoexCoordinatorTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/CoexCoordinatorTest.java
@@ -415,7 +415,7 @@
// Auth was attempted
when(mUdfpsClient.getState())
.thenReturn(AuthenticationClient.STATE_STARTED_PAUSED_ATTEMPTED);
- verify(mCallback, never()).sendHapticFeedback();
+ verify(mCallback).sendHapticFeedback();
verify(mCallback).handleLifecycleAfterAuth();
// Then face rejected. Note that scheduler leaves UDFPS in the CoexCoordinator since
@@ -425,7 +425,7 @@
LockoutTracker.LOCKOUT_NONE, faceCallback);
verify(faceCallback).sendHapticFeedback();
verify(faceCallback).sendAuthenticationResult(eq(false) /* addAuthTokenIfStrong */);
- verify(mCallback, never()).sendHapticFeedback();
+ verify(mCallback).sendHapticFeedback();
}
@Test
