From 56b7c056ba8750d39d0bb858f1ec45897c413ad5 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Tue, 10 Oct 2023 21:33:04 +0000
Subject: [PATCH] Revert^2 "Remove HIDL graphics.mapper service from V+"

1491721640ef25f54ff18cc973a8372bb3c39755

This topic fixes the dependencies that caused the inital revert (b/300115646): https://googleplex-android-review.git.corp.google.com/q/topic:%22camera_fail2%22

Test: CtsCameraTestCases CtsAppOpsTestCases
Bug: 285605852

Change-Id: I9553e2918a619c1a2409046e7e4fe48219679a6e
---
 compatibility_matrices/compatibility_matrix.9.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/compatibility_matrices/compatibility_matrix.9.xml b/compatibility_matrices/compatibility_matrix.9.xml
index 9a9af1c109..59fd2b0a1e 100644
--- a/compatibility_matrices/compatibility_matrix.9.xml
+++ b/compatibility_matrices/compatibility_matrix.9.xml
@@ -238,15 +238,6 @@
             <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>
@@ -686,7 +677,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <!-- Either the native or the HIDL mapper HAL must exist on the device -->
+    <!-- The native mapper HAL must exist on the device -->
     <hal format="native" optional="true">
         <name>mapper</name>
         <version>5.0</version>