From d874a23fc07a3e8c254a68a0ca56ca917ac96dac Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Fri, 27 Jan 2023 23:10:56 +0000
Subject: [PATCH] Make android.hardware.thermal HAL optional

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: atest vts_treble_vintf_vendor_test
Bug: 247575800
Change-Id: I0da1b10b2bf5c10b19b2713b56be72738a15eec1
---
 compatibility_matrices/compatibility_matrix.7.xml | 2 +-
 compatibility_matrices/compatibility_matrix.8.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compatibility_matrices/compatibility_matrix.7.xml b/compatibility_matrices/compatibility_matrix.7.xml
index 26b8d63c5c..c2675166ed 100644
--- a/compatibility_matrices/compatibility_matrix.7.xml
+++ b/compatibility_matrices/compatibility_matrix.7.xml
@@ -682,7 +682,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
+    <hal format="hidl" optional="true">
         <name>android.hardware.thermal</name>
         <version>2.0</version>
         <interface>
diff --git a/compatibility_matrices/compatibility_matrix.8.xml b/compatibility_matrices/compatibility_matrix.8.xml
index 64bfc7ac34..e3207342a0 100644
--- a/compatibility_matrices/compatibility_matrix.8.xml
+++ b/compatibility_matrices/compatibility_matrix.8.xml
@@ -692,7 +692,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="false">
+    <hal format="aidl" optional="true">
         <name>android.hardware.thermal</name>
         <version>1</version>
         <interface>