Revert "sm6150-common: Move to Xiaomi fingerprint AIDL"

This reverts commit 20d156bcab.

- also drop fcm entry

Signed-off-by: therealmharc <therealmharc@gmail.com>

configs/hidl/device_framework_matrix.xml

@@ -1,12 +1,4 @@
 <compatibility-matrix version="1.0" type="framework">
-<hal format="aidl" optional="true">
-    <name>android.hardware.biometrics.fingerprint</name>
-    <version>4</version>
-    <interface>
-        <name>IFingerprint</name>
-        <instance>default</instance>
-    </interface>
-</hal>
 <hal format="aidl" optional="true">
     <name>android.hardware.bluetooth.audio</name>
     <version>4</version>

overlay/frameworks/base/core/res/res/values/config.xml

@@ -274,6 +274,14 @@
         <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
     </integer-array>
 
+    <!-- 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" >
+        <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
+    </string-array>
+
     <!-- Whether device has turbo power charging support -->
     <bool name="config_hasTurboPowerCharger">true</bool>
 

sepolicy/vendor/file_contexts

@@ -46,7 +46,7 @@
 /sys/devices/virtual/touch/tp_dev/fp_state                           u:object_r:vendor_sysfs_sensors:s0
 
 # HALs
-/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.xiaomi u:object_r:hal_fingerprint_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.3-service\.xiaomi u:object_r:hal_fingerprint_default_exec:s0
 /vendor/bin/hw/vendor\.lineage\.livedisplay@2\.1-service\.xiaomi_sm6150    u:object_r:hal_lineage_livedisplay_qti_exec:s0
 /vendor/bin/hw/vendor\.xiaomi\.hardware\.motor@1\.0-service                u:object_r:hal_motor_default_exec:s0
 /vendor/bin/hw/android\.hardware\.power-service\.pixel-libperfmgr          u:object_r:hal_power_default_exec:s0

sepolicy/vendor/property_contexts

@@ -6,7 +6,6 @@ persist.vendor.aiie_capture_log.   u:object_r:vendor_camera_prop:s0
 persist.vendor.low.cutoff          u:object_r:vendor_camera_prop:s0
 
 # Fingerprint
-persist.vendor.fingerprint.        u:object_r:vendor_fp_prop:s0
 persist.vendor.sys.fp.             u:object_r:vendor_fp_prop:s0
 ro.boot.fpsensor                   u:object_r:vendor_fp_prop:s0
 ro.hardware.fp                     u:object_r:vendor_fp_prop:s0

sm6150.mk

@@ -149,7 +149,7 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint-service.xiaomi
+    android.hardware.biometrics.fingerprint@2.3-service.xiaomi
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml