From 58ef934082384924b81ee91554235020d0fb7e21 Mon Sep 17 00:00:00 2001
From: Alec Foster <ajfoster@google.com>
Date: Fri, 10 Nov 2023 00:58:07 +0000
Subject: [PATCH 1/2] Revert^2 "Add vendor.qti.hardware.fingerprint aidl to
 xml"

a62f586e881bbfb028b82a6010e66c9b1f77945f

Change-Id: I3083365e58d27e6627145672c6e90d9f2ac5f6c2
---
 .../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 88da167121779a0456cc31d09f689d5dccbec2cb Mon Sep 17 00:00:00 2001
From: Alec Foster <ajfoster@google.com>
Date: Fri, 10 Nov 2023 00:58:07 +0000
Subject: [PATCH 2/2] Revert^2 "Add QFingerprintService to makefile."

35258f89ab5b31da7afd1818bef0d6e724608e7e

Change-Id: I3c76b8e0f0313eee57a4b08379a5f364bc22aaaa
---
 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 += \