Gralloc: AIDL HAL may replace HIDL HAL.
Relax the requirement on compatibility matrices
that HIDL allocator HAL must exist on devices with
target level 3~6, because they may have the AIDL
Gralloc HAL instead. Use DeviceManifestTest.GrallocHal
to enforce the requirement.
Also fix comments.
Bug: 232003062
Test: TH
Change-Id: Ia00a9bdb15a39ebeb1ad74f3c922fe7923d7542d
diff --git a/compatibility_matrices/compatibility_matrix.5.xml b/compatibility_matrices/compatibility_matrix.5.xml
index 3642814..12b85c7 100644
--- a/compatibility_matrices/compatibility_matrix.5.xml
+++ b/compatibility_matrices/compatibility_matrix.5.xml
@@ -208,7 +208,10 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <!-- Either the AIDL or the HIDL allocator HAL must exist on the device.
+ If the HIDL composer HAL exists, it must be at least version 2.0.
+ See DeviceManifestTest.GrallocHal -->
+ <hal format="hidl" optional="true">
<name>android.hardware.graphics.allocator</name>
<!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->
<version>2.0</version>