From 35258f89ab5b31da7afd1818bef0d6e724608e7e Mon Sep 17 00:00:00 2001
From: Alec Foster <ajfoster@google.com>
Date: Thu, 9 Nov 2023 22:37:52 +0000
Subject: [PATCH 1/2] Revert "Add QFingerprintService to makefile."

Revert submission 25252188-qfp_sba4500

Reason for revert: Missing SeLinux policies, see b/309966766.

Reverted changes: /q/submissionid:25252188-qfp_sba4500

Change-Id: I6d3734942e3c1e3b330f35520ffc694c0dc862b2
---
 fingerprint/ultrasonic_udfps.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk
index df84688a..589560cd 100644
--- a/fingerprint/ultrasonic_udfps.mk
+++ b/fingerprint/ultrasonic_udfps.mk
@@ -16,12 +16,10 @@
 
 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 += \

From a62f586e881bbfb028b82a6010e66c9b1f77945f Mon Sep 17 00:00:00 2001
From: Alec Foster <ajfoster@google.com>
Date: Thu, 9 Nov 2023 22:37:52 +0000
Subject: [PATCH 2/2] Revert "Add vendor.qti.hardware.fingerprint aidl to xml"

Revert submission 25252188-qfp_sba4500

Reason for revert: Missing SeLinux policies, see b/309966766.

Reverted changes: /q/submissionid:25252188-qfp_sba4500

Change-Id: If25aadad114db916575500972919ab38c111a67c
---
 .../device_framework_matrix_product.xml       | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

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