85 lines
3.9 KiB
Diff
85 lines
3.9 KiB
Diff
From ce6a18178130952fd1238d2fa66aceef1c114ed1 Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Hugues Husson <phh@phh.me>
|
|
Date: Thu, 21 May 2020 18:42:20 +0200
|
|
Subject: [PATCH 57/58] Always try to get FOD HALs, because we check samsung
|
|
HAL later to compute width
|
|
|
|
---
|
|
.../biometrics/fingerprint/FacolaView.java | 60 +++++++++----------
|
|
1 file changed, 29 insertions(+), 31 deletions(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FacolaView.java b/services/core/java/com/android/server/biometrics/fingerprint/FacolaView.java
|
|
index aeb81f5b7c9..3536093a4ee 100644
|
|
--- a/services/core/java/com/android/server/biometrics/fingerprint/FacolaView.java
|
|
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FacolaView.java
|
|
@@ -170,37 +170,35 @@ public class FacolaView extends ImageView implements OnTouchListener {
|
|
mPaintShow.setColor(Color.argb(0x18, 0x00, 0xff, 0x00));
|
|
setOnTouchListener(this);
|
|
Slog.d("PHH-Enroll", "Created facola...");
|
|
- if(mW != -1) {
|
|
- try {
|
|
- mXiaomiFingerprint = IXiaomiFingerprint.getService();
|
|
- } catch(Exception e) {
|
|
- Slog.d("PHH-Enroll", "Failed getting xiaomi fingerprint service", e);
|
|
- }
|
|
- try {
|
|
- mGoodixFingerprint = IGoodixFPExtendService.getService();
|
|
- } catch(Exception e) {
|
|
- Slog.d("PHH-Enroll", "Failed getting goodix fingerprint service", e);
|
|
- }
|
|
- try {
|
|
- mGoodixFingerprintV2_1 = vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon.getService();
|
|
- } catch(Exception e) {
|
|
- Slog.d("PHH-Enroll", "Failed getting goodix2 fingerprint service", e);
|
|
- }
|
|
- try {
|
|
- mSamsungFingerprint = ISecBiometricsFingerprint.getService();
|
|
- } catch(Exception e) {
|
|
- Slog.d("PHH-Enroll", "Failed getting samsung fingerprint service", e);
|
|
- }
|
|
- try {
|
|
- mSamsungFingerprint3_0 = ISehBiometricsFingerprint.getService();
|
|
- } catch(Exception e) {
|
|
- Slog.d("PHH-Enroll", "Failed getting samsung 3.0 fingerprint service", e);
|
|
- }
|
|
- try {
|
|
- mOppoFingerprint = vendor.oppo.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint.getService();
|
|
- } catch(Exception e) {
|
|
- Slog.d("PHH-Enroll", "Failed getting oppo fingerprint service", e);
|
|
- }
|
|
+ try {
|
|
+ mXiaomiFingerprint = IXiaomiFingerprint.getService();
|
|
+ } catch(Exception e) {
|
|
+ Slog.d("PHH-Enroll", "Failed getting xiaomi fingerprint service", e);
|
|
+ }
|
|
+ try {
|
|
+ mGoodixFingerprint = IGoodixFPExtendService.getService();
|
|
+ } catch(Exception e) {
|
|
+ Slog.d("PHH-Enroll", "Failed getting goodix fingerprint service", e);
|
|
+ }
|
|
+ try {
|
|
+ mGoodixFingerprintV2_1 = vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon.getService();
|
|
+ } catch(Exception e) {
|
|
+ Slog.d("PHH-Enroll", "Failed getting goodix2 fingerprint service", e);
|
|
+ }
|
|
+ try {
|
|
+ mSamsungFingerprint = ISecBiometricsFingerprint.getService();
|
|
+ } catch(Exception e) {
|
|
+ Slog.d("PHH-Enroll", "Failed getting samsung fingerprint service", e);
|
|
+ }
|
|
+ try {
|
|
+ mSamsungFingerprint3_0 = ISehBiometricsFingerprint.getService();
|
|
+ } catch(Exception e) {
|
|
+ Slog.d("PHH-Enroll", "Failed getting samsung 3.0 fingerprint service", e);
|
|
+ }
|
|
+ try {
|
|
+ mOppoFingerprint = vendor.oppo.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint.getService();
|
|
+ } catch(Exception e) {
|
|
+ Slog.d("PHH-Enroll", "Failed getting oppo fingerprint service", e);
|
|
}
|
|
|
|
if(mSamsungFingerprint3_0 != null || mSamsungFingerprint != null) {
|
|
--
|
|
2.25.1
|
|
|