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
diff --git a/compatibility_matrices/compatibility_matrix.9.xml b/compatibility_matrices/compatibility_matrix.9.xml
index 59fd2b0..9a9af1c 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>