Update logic when multiple fingerprint sensors exist
Bug: 172957689
Test: atest CtsBiometricsTestCases
Change-Id: Ifd61f8e4c1ec381837eb7c1b635b1bdeeaa54eb1
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
index 6c975fc..0cbd440 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
@@ -746,14 +746,14 @@
}
/**
- * For devices with only a single provider, returns that provider. If no providers, or multiple
- * providers exist, returns null.
+ * For devices with only a single provider, returns that provider. If multiple providers,
+ * returns the first one. If no providers, returns null.
*/
@Nullable
private Pair<Integer, ServiceProvider> getSingleProvider() {
final List<FingerprintSensorPropertiesInternal> properties = getSensorProperties();
- if (properties.size() != 1) {
- Slog.e(TAG, "Multiple sensors found: " + properties.size());
+ if (properties.isEmpty()) {
+ Slog.e(TAG, "No providers found");
return null;
}
@@ -766,7 +766,7 @@
}
}
- Slog.e(TAG, "Single sensor, but provider not found");
+ Slog.e(TAG, "Provider not found");
return null;
}