From 50a73bca752bc137f89c9c16d03cdf0491ae4545 Mon Sep 17 00:00:00 2001
From: Jason Macnak <natsu@google.com>
Date: Wed, 26 Jan 2022 13:16:30 -0800
Subject: [PATCH] composer: AIDL HAL may replace HIDL HAL.

Relax the requirement on compatibility matrices that the HIDL
composer HAL must exist on devices with target level 7 as they
may have the AIDL composer HAL instead. Use
DeviceManifestTest.ComposerHal to enforce the requirement instead.

Bug: b/216514585
Test: vts_treble_vintf_vendor_test
Change-Id: I7fc85b3c8841d9686863ab52c8b5bb88e1f5ee0a
---
 compatibility_matrices/compatibility_matrix.current.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index dc716bbdc0..cd20615d37 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -300,7 +300,10 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
+    <!-- Either the AIDL or the HIDL composer HAL must exist on the device.
+         If the HIDL composer HAL exists, it must be at least version 2.1.
+         See DeviceManifestTest.ComposerHal -->
+    <hal format="hidl" optional="true">
         <name>android.hardware.graphics.composer</name>
         <version>2.1-4</version>
         <interface>