commit 6f691f1810d971a0be53e1dcbdf5a72f9cc908b3
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 04 21:42:41 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 04 21:42:41 2022 +0000
tree 9abd339d6be7e8e9ae265607f78341be83b5f634
parent 9290c6f3268f507b9a91118c20a3b0bb15b6e827
parent 50a73bca752bc137f89c9c16d03cdf0491ae4545

Merge "composer: AIDL HAL may replace HIDL HAL."

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index f728174..df10cf5 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>