From 1491721640ef25f54ff18cc973a8372bb3c39755 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Tue, 12 Sep 2023 20:55:18 +0000
Subject: [PATCH] Revert "Remove HIDL graphics.mapper service from V+"

Revert submission 24707439-mapper5_cf

Reason for revert: Camera CTS tests fail b/300115646

Reverted changes: /q/submissionid:24707439-mapper5_cf

Change-Id: I00f0e4ef363455e68f838b0d9a967fbee8b272a6
---
 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>