42 lines
2 KiB
Diff
42 lines
2 KiB
Diff
From 45736b5d760fdac0ec405f1620942ff9a7c023d9 Mon Sep 17 00:00:00 2001
|
|
From: Peter Cai <peter@typeblog.net>
|
|
Date: Sun, 22 Sep 2024 22:53:01 -0400
|
|
Subject: [PATCH 06/11] AuthService: HIDL and AIDL fingerprint services are
|
|
mutually exclusive
|
|
|
|
...and make sure that we prioritize AIDL over HIDL. This is essential
|
|
for GSIs to boot on newer devices while having the HIDL property set for
|
|
compatibility with older ones.
|
|
|
|
Change-Id: I834297a44674820d813d8f6d376dfd294f084f3b
|
|
---
|
|
.../com/android/server/biometrics/AuthService.java | 10 ++++------
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
|
|
index 2d802b21c..0730d634f 100644
|
|
--- a/services/core/java/com/android/server/biometrics/AuthService.java
|
|
+++ b/services/core/java/com/android/server/biometrics/AuthService.java
|
|
@@ -908,15 +908,13 @@ public class AuthService extends SystemService {
|
|
|
|
handlerProvider.getFingerprintHandler().post(() -> {
|
|
final FingerprintSensorConfigurations mFingerprintSensorConfigurations =
|
|
- new FingerprintSensorConfigurations(!(hidlConfigStrings != null
|
|
- && hidlConfigStrings.length > 0));
|
|
-
|
|
- if (hidlConfigStrings != null && hidlConfigStrings.length > 0) {
|
|
- mFingerprintSensorConfigurations.addHidlSensors(hidlConfigStrings, context);
|
|
- }
|
|
+ new FingerprintSensorConfigurations(fingerprintAidlInstances != null
|
|
+ && fingerprintAidlInstances.length > 0);
|
|
|
|
if (fingerprintAidlInstances != null && fingerprintAidlInstances.length > 0) {
|
|
mFingerprintSensorConfigurations.addAidlSensors(fingerprintAidlInstances);
|
|
+ } else if (hidlConfigStrings != null && hidlConfigStrings.length > 0) {
|
|
+ mFingerprintSensorConfigurations.addHidlSensors(hidlConfigStrings, context);
|
|
}
|
|
|
|
if (fingerprintService != null) {
|
|
--
|
|
2.48.1
|
|
|