From c2b251f4a9dd7125951abd4541e2df7fda79d73a Mon Sep 17 00:00:00 2001
From: chenkris <chenkris@google.com>
Date: Fri, 25 Oct 2024 05:15:39 +0000
Subject: [PATCH 1/2] Add IGoodixFingerprintDaemon aidl interface

Flag: EXEMPT NDK
Bug: 370671685
Test: authenticate fingerprint.
Change-Id: I06198a5b68129a8a79eb7078ef8ed57bf5fbc6c7
---
 device_framework_matrix_product.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index f1e620c8..f9dc27ac 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -100,6 +100,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.goodix.hardware.biometrics.fingerprint</name>
+        <version>1</version>
+        <interface>
+            <name>IGoodixFingerprintDaemon</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
         <version>2-3</version>

From ecb4cc268222e76f1be009fe8e3e13a1ad3659e7 Mon Sep 17 00:00:00 2001
From: "Priyanka Advani (xWF)" <padvani@google.com>
Date: Wed, 30 Oct 2024 16:32:55 +0000
Subject: [PATCH 2/2] Revert "Add IGoodixFingerprintDaemon aidl interface"

Revert submission 30066446-goodix-ext-service-aidl

Reason for revert: Droidmonitor created revert due to b/376465180. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:30066446-goodix-ext-service-aidl

Change-Id: I720eb17fbdf9961ba5505ef83e2b5b53f95e9639
---
 device_framework_matrix_product.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index f9dc27ac..f1e620c8 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -100,14 +100,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.goodix.hardware.biometrics.fingerprint</name>
-        <version>1</version>
-        <interface>
-            <name>IGoodixFingerprintDaemon</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
         <version>2-3</version>