From 23d24a262a01f3b5514884ca16594f03946e592c Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Thu, 3 Dec 2020 11:15:02 -0800 Subject: [PATCH] Update logic when multiple fingerprint sensors exist Bug: 172957689 Test: atest CtsBiometricsTestCases Change-Id: Ifd61f8e4c1ec381837eb7c1b635b1bdeeaa54eb1 --- .../sensors/fingerprint/FingerprintService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 6c975fc128900..0cbd440a6a257 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 @@ public class FingerprintService extends SystemService implements BiometricServic } /** - * 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 getSingleProvider() { final List 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 @@ public class FingerprintService extends SystemService implements BiometricServic } } - Slog.e(TAG, "Single sensor, but provider not found"); + Slog.e(TAG, "Provider not found"); return null; }