From 088d7944e47b85fbdfd566693d9b3586b16d058b Mon Sep 17 00:00:00 2001
From: Devika Krishnadas <kdevika@google.com>
Date: Tue, 9 Jan 2024 23:23:10 +0000
Subject: [PATCH 1/2] Revert^3 "Use graphics allocator 2"

60257881adf1b6b4ec5b342a0210cbb6e3fff97f

Reverting to comply with the Allocator VTS for 24Q1, do not merge to main.

Bug: 310046460
Test: VtsHalGraphicsAllocatorAidl_TargetTest
Change-Id: I47f69b046c798ea15eb48debdc55c3a7273ac007
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 4b5309f..a62e995 100644
--- a/device.mk
+++ b/device.mk
@@ -554,7 +554,7 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
 	android.hardware.graphics.mapper@4.0-impl \
-	android.hardware.graphics.allocator-V2-service
+	android.hardware.graphics.allocator-V1-service
 
 PRODUCT_PACKAGES += \
 	memtrack.$(TARGET_BOARD_PLATFORM) \

From 0e4c410042aaae3fcf373af6dc72565558267e78 Mon Sep 17 00:00:00 2001
From: Mingguang Xu <mingguangxu@google.com>
Date: Wed, 10 Jan 2024 23:22:09 +0000
Subject: [PATCH 2/2] zumapro: Add Twoshay's IGrilAntennaTuningService to
 manifest

Bug: 268562469

Test: manual

Change-Id: I39c61fe53768b2bd2cbbe236505c98f98d4fc8ae
Signed-off-by: Mingguang Xu <mingguangxu@google.com>
---
 device_framework_matrix_product.xml | 8 ++++++++
 manifest.xml                        | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 10416a2..2005f2d 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -127,6 +127,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>com.google.input.algos.gril</name>
+        <version>2</version>
+        <interface>
+            <name>IGrilAntennaTuningService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl" optional="true">
         <name>com.google.input</name>
         <interface>
diff --git a/manifest.xml b/manifest.xml
index e5c9f76..64b1764 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -19,6 +19,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl">
+        <name>com.google.input.algos.gril</name>
+        <version>2</version>
+        <interface>
+            <name>IGrilAntennaTuningService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl">
         <name>com.google.input</name>
         <interface>