From a9d212bffc361449860130c3164fcf64cc54bc72 Mon Sep 17 00:00:00 2001
From: Alec Foster <ajfoster@google.com>
Date: Sat, 21 Oct 2023 23:35:45 +0000
Subject: [PATCH 1/2] Add vendor.qti.hardware.fingerprint aidl to xml

Bug: 301519748
Test: Compiles.
Change-Id: I55c5111f68da8e08e6970c26f647696be6aa1593
---
 .../device_framework_matrix_product.xml       | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/fingerprint/device_framework_matrix_product.xml b/fingerprint/device_framework_matrix_product.xml
index 8e0a33c5..16b05592 100644
--- a/fingerprint/device_framework_matrix_product.xml
+++ b/fingerprint/device_framework_matrix_product.xml
@@ -6,11 +6,27 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="aidl" optional="true">
         <name>vendor.qti.hardware.fingerprint</name>
-        <version>1.0</version>
+        <version>1</version>
         <interface>
-            <name>IQtiExtendedFingerprint</name>
+            <name>IQfpExtendedFingerprint</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.fingerprint</name>
+        <version>1</version>
+        <interface>
+            <name>IQfpExtendedSession</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.fingerprint</name>
+        <version>1</version>
+        <interface>
+            <name>IQfpExtendedSessionCallback</name>
             <instance>default</instance>
         </interface>
     </hal>

From efb51a830c054771f8a01988d4ad004568d1f237 Mon Sep 17 00:00:00 2001
From: Alec Foster <ajfoster@google.com>
Date: Tue, 31 Oct 2023 23:24:25 +0000
Subject: [PATCH 2/2] Add QFingerprintService to makefile.

Bug: 301519748
Test: Compiles.
Change-Id: I35ca67bca55c96c0f9da2f992a2e1f4af7361583
---
 fingerprint/ultrasonic_udfps.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk
index 589560cd..df84688a 100644
--- a/fingerprint/ultrasonic_udfps.mk
+++ b/fingerprint/ultrasonic_udfps.mk
@@ -16,10 +16,12 @@
 
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/qcom/fingerprint/qfp-service \
+	vendor/qcom/fingerprint/QFingerprintService \
 	vendor/qcom/fingerprint/QFPCalibration \
 
 PRODUCT_PACKAGES += \
 	qfp-daemon \
+	QFingerprintService \
 	QFPCalibration \
 
 PRODUCT_COPY_FILES += \