From f2cada53a3fc03ad772a7c88e7c8ed73bb5af7fb Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Thu, 26 Jan 2023 21:08:59 +0000
Subject: [PATCH] Change optional="false" to "true" in compat matrix 7

A common workflow for vendors is to develop their new launching devices
targeting N-1 compatibility matrix so they can update each of their HALs
independently at different times.

This works because the target (N-1) framework compatibility matrix is squashed
with the newer compatibility matrices allowing the use of newer
interfaces.

This doesn't work when converting a service from HIDL to AIDL when the
HIDL service is marked as optional="false". It allows for the use of the
new AIDL interface, but it still requires the old HIDL interface.

Marking the old HIDL interfaces as optional allows vendors to develop
before the device targets level 8.

Test: m
Bug: 247575800
Change-Id: I4446cdaa4a44b4dae1e9eee68089bf723dd25276
---
 compatibility_matrices/compatibility_matrix.7.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compatibility_matrices/compatibility_matrix.7.xml b/compatibility_matrices/compatibility_matrix.7.xml
index 26b8d63c5c..36fdba8bdf 100644
--- a/compatibility_matrices/compatibility_matrix.7.xml
+++ b/compatibility_matrices/compatibility_matrix.7.xml
@@ -7,7 +7,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
+    <hal format="hidl" optional="true">
         <name>android.hardware.audio</name>
         <version>6.0</version>
         <version>7.0-1</version>
@@ -16,7 +16,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
+    <hal format="hidl" optional="true">
         <name>android.hardware.audio.effect</name>
         <version>6.0</version>
         <version>7.0</version>
@@ -238,7 +238,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
+    <hal format="hidl" optional="true">
         <name>android.hardware.gatekeeper</name>
         <version>1.0</version>
         <interface>
@@ -316,7 +316,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
+    <hal format="hidl" optional="true">
         <name>android.hardware.graphics.mapper</name>
         <!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->
         <version>2.1</version>