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

This commit is contained in:
Devin Moore
2023-10-11 16:53:50 +00:00
committed by Android (Google) Code Review

View File

@@ -240,15 +240,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>
@@ -688,7 +679,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>