From a5adaea5f26cda84b67cfeee3c6caa2a198bc3f0 Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim@linux4.de>
Date: Sun, 21 Jan 2024 20:08:37 +0100
Subject: [PATCH] sm8350-common: Switch to AIDL Fingerprint HAL

- As of Android 15, AIDL Fingerprint HAL is required to set fingerprint icon indicator pos.

Change-Id: Ic5bb3ed213bbdfe147c863aa7258bde4731e06dd
Signed-off-by: Cyber Knight <cyberknight755@gmail.com>
Signed-off-by: shoya0x00 <shoya0x00@users.noreply.github.com>
---
 common.mk                                              | 2 +-
 overlay/frameworks/base/core/res/res/values/config.xml | 9 ---------
 sepolicy/vendor/file_contexts                          | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/common.mk b/common.mk
index 80ae206..aefb24f 100644
--- a/common.mk
+++ b/common.mk
@@ -160,7 +160,7 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.3-service.xiaomi
+    android.hardware.biometrics.fingerprint-service.xiaomi
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6449178..c0a8b38 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -196,15 +196,6 @@
     <!-- Whether device supports double tap to wake -->
     <bool name="config_supportDoubleTapWake">true</bool>
 
-    <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
-         when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
-         where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
-         and Strength as defined in Authenticators.java -->
-    <string-array name="config_biometric_sensors" translatable="false" >
-        <!-- ID0:Fingerprint:Strong -->
-        <item>0:2:15</item>
-    </string-array>
-
     <!-- Default list of files pinned by the Pinner Service -->
     <string-array translatable="false" name="config_defaultPinnerServiceFiles">
         <item>"/system/framework/framework.jar"</item>
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index b8914e5..7cf0d85 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -52,7 +52,7 @@
 /data/vendor/fpc(/.*)?                                              u:object_r:fingerprint_vendor_data_file:s0
 /data/vendor/fpdump(/.*)?                                           u:object_r:fingerprint_vendor_data_file:s0
 /data/vendor/goodix(/.*)?                                           u:object_r:fingerprint_vendor_data_file:s0
-/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.3-service\.xiaomi u:object_r:hal_fingerprint_default_exec:s0
+/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.xiaomi u:object_r:hal_fingerprint_default_exec:s0
 /sys/devices/platform/soc/soc:qcom,dsi-display-primary/fod_hbm      u:object_r:vendor_sysfs_udfps:s0
 /sys/devices/platform/soc/soc:qcom,dsi-display-primary/fod_ui       u:object_r:vendor_sysfs_udfps:s0
 /sys/devices/virtual/touch/tp_dev/fod_status                        u:object_r:vendor_sysfs_udfps:s0