commit 6a8ca65803e2b0f926e9b127ccdf327b3c5ffd50
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Oct 12 01:18:32 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 12 01:18:32 2023 +0000
tree d76569a7fcb425ca8d1ec15b086109b04ba1994a
parent 78b9b7be395fd62ea1ee62b28c22d633bb7b0fcd
parent 2226b540cd2b5d46cd1a76e7df92ea3d59c299ab

Merge "Revert^3 "Remove HIDL graphics.mapper service from V+"" into main

compatibility_matrices/compatibility_matrix.9.xml

diff --git a/compatibility_matrices/compatibility_matrix.9.xml b/compatibility_matrices/compatibility_matrix.9.xml
index a201e8c..0013923 100644
--- a/compatibility_matrices/compatibility_matrix.9.xml
+++ b/compatibility_matrices/compatibility_matrix.9.xml
@@ -240,6 +240,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <!-- Either the native or the HIDL mapper HAL must exist on the device -->
+    <hal format="hidl" optional="true">
+        <name>android.hardware.graphics.mapper</name>
+        <version>4.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.health</name>
         <version>1-2</version>
@@ -679,7 +688,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <!-- The native mapper HAL must exist on the device -->
+    <!-- Either the native or the HIDL mapper HAL must exist on the device -->
     <hal format="native" optional="true">
         <name>mapper</name>
         <version>5.0</version>