From 14c6c627ef0cea8caef9ace51ce087bb5bba9e55 Mon Sep 17 00:00:00 2001
From: Mark Chang <changmark@google.com>
Date: Wed, 7 Feb 2024 12:17:28 +0000
Subject: [PATCH] Add AIDL manifests and FCMs for twoshay.

[169/186] DeviceManifest/SingleAidlTest#HalIsServed/com_google_input_ITouchContextService_default_V3_76: PASSED (4ms)
[170/186] DeviceManifest/SingleAidlTest#HalIsServed/com_google_input_algos_gril_IGrilAntennaTuningService_default_V3_77: PASSED (4ms)
[171/186] DeviceManifest/SingleAidlTest#HalIsServed/com_google_input_algos_spd_IScreenProtectorDetectorService_default_V3_78: PASSED (4ms)

Bug: 324214410
Test: atest vts_treble_vintf_vendor_test.
Test: Twoshay's AIDLs pass SingleAidlTest.
Change-Id: Ia307034a2f88011642d4bcf80e8aa4496266fd35
Signed-off-by: Mark Chang <changmark@google.com>
---
 .../aidl/compatibility_matrix_gs101.xml       | 10 +++++++
 .../aidl/compatibility_matrix_zuma.xml        | 26 +++++++++++++++++++
 touch/twoshay/aidl/manifest_gs101.xml         | 10 +++++++
 touch/twoshay/aidl/manifest_zuma.xml          | 26 +++++++++++++++++++
 touch/twoshay/aidl_gs101.mk                   |  2 ++
 touch/twoshay/aidl_zuma.mk                    |  2 ++
 6 files changed, 76 insertions(+)
 create mode 100644 touch/twoshay/aidl/compatibility_matrix_gs101.xml
 create mode 100644 touch/twoshay/aidl/compatibility_matrix_zuma.xml
 create mode 100644 touch/twoshay/aidl/manifest_gs101.xml
 create mode 100644 touch/twoshay/aidl/manifest_zuma.xml
 create mode 100644 touch/twoshay/aidl_gs101.mk
 create mode 100644 touch/twoshay/aidl_zuma.mk

diff --git a/touch/twoshay/aidl/compatibility_matrix_gs101.xml b/touch/twoshay/aidl/compatibility_matrix_gs101.xml
new file mode 100644
index 0000000..aaa2d6e
--- /dev/null
+++ b/touch/twoshay/aidl/compatibility_matrix_gs101.xml
@@ -0,0 +1,10 @@
+<compatibility-matrix version="1.0" type="framework">
+    <hal format="aidl" optional="true">
+        <name>com.google.input</name>
+        <version>2-3</version>
+        <interface>
+            <name>ITouchContextService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
diff --git a/touch/twoshay/aidl/compatibility_matrix_zuma.xml b/touch/twoshay/aidl/compatibility_matrix_zuma.xml
new file mode 100644
index 0000000..25d5c50
--- /dev/null
+++ b/touch/twoshay/aidl/compatibility_matrix_zuma.xml
@@ -0,0 +1,26 @@
+<compatibility-matrix version="1.0" type="framework">
+    <hal format="aidl" optional="true">
+        <name>com.google.input</name>
+        <version>2-3</version>
+        <interface>
+            <name>ITouchContextService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>com.google.input.algos.gril</name>
+        <version>2-3</version>
+        <interface>
+            <name>IGrilAntennaTuningService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>com.google.input.algos.spd</name>
+        <version>2-3</version>
+        <interface>
+            <name>IScreenProtectorDetectorService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
diff --git a/touch/twoshay/aidl/manifest_gs101.xml b/touch/twoshay/aidl/manifest_gs101.xml
new file mode 100644
index 0000000..28472a0
--- /dev/null
+++ b/touch/twoshay/aidl/manifest_gs101.xml
@@ -0,0 +1,10 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>com.google.input</name>
+        <version>3</version>
+        <interface>
+            <name>ITouchContextService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/touch/twoshay/aidl/manifest_zuma.xml b/touch/twoshay/aidl/manifest_zuma.xml
new file mode 100644
index 0000000..dbac77d
--- /dev/null
+++ b/touch/twoshay/aidl/manifest_zuma.xml
@@ -0,0 +1,26 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>com.google.input</name>
+        <version>3</version>
+        <interface>
+            <name>ITouchContextService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>com.google.input.algos.gril</name>
+        <version>3</version>
+        <interface>
+            <name>IGrilAntennaTuningService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>com.google.input.algos.spd</name>
+        <version>3</version>
+        <interface>
+            <name>IScreenProtectorDetectorService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/touch/twoshay/aidl_gs101.mk b/touch/twoshay/aidl_gs101.mk
new file mode 100644
index 0000000..1676cba
--- /dev/null
+++ b/touch/twoshay/aidl_gs101.mk
@@ -0,0 +1,2 @@
+DEVICE_MANIFEST_FILE += device/google/gs-common/touch/twoshay/aidl/manifest_gs101.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/touch/twoshay/aidl/compatibility_matrix_gs101.xml
diff --git a/touch/twoshay/aidl_zuma.mk b/touch/twoshay/aidl_zuma.mk
new file mode 100644
index 0000000..48714fe
--- /dev/null
+++ b/touch/twoshay/aidl_zuma.mk
@@ -0,0 +1,2 @@
+DEVICE_MANIFEST_FILE += device/google/gs-common/touch/twoshay/aidl/manifest_zuma.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/touch/twoshay/aidl/compatibility_matrix_zuma.xml