From 2226b540cd2b5d46cd1a76e7df92ea3d59c299ab Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Thu, 12 Oct 2023 00:10:09 +0000
Subject: [PATCH] Revert^3 "Remove HIDL graphics.mapper service from V+"

56b7c056ba8750d39d0bb858f1ec45897c413ad5

Change-Id: I1872654da10501ee3fe05b813d87ba4cfcb2e040
---
 compatibility_matrices/compatibility_matrix.9.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/compatibility_matrices/compatibility_matrix.9.xml b/compatibility_matrices/compatibility_matrix.9.xml
index 59fd2b0a1e..9a9af1c109 100644
--- a/compatibility_matrices/compatibility_matrix.9.xml
+++ b/compatibility_matrices/compatibility_matrix.9.xml
@@ -238,6 +238,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>
@@ -677,7 +686,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>