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

Flag: EXEMPT NDK
Bug: 370671685
Test: authenticate fingerprint.
Change-Id: I3612ab313a2b9d330da3d39f09073f3ff9eebcd6
---
 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 879f614f..5abc3633 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -135,6 +135,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 0ca2ed53c576b436668de6b8c1465a486e95c3c4 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: I25cf72f9acbfcce57182aeb8f95a5711af9899b4
---
 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 5abc3633..879f614f 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -135,14 +135,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>