health: AIDL HAL may replace HIDL HAL.
Relax the requirement on compatibility matrices
that HIDL health HAL must exist on devices with
target level 3~6, because they may have the AIDL
health HAL instead. Use DeviceManifestTest.HealthHal
to enforce the requirement.
Test: TH
Bug: 211518384
Change-Id: I9f82278bd10e2bd775705041630bcb6f421df8b8
diff --git a/compatibility_matrices/compatibility_matrix.5.xml b/compatibility_matrices/compatibility_matrix.5.xml
index 0fb21a7..3642814 100644
--- a/compatibility_matrices/compatibility_matrix.5.xml
+++ b/compatibility_matrices/compatibility_matrix.5.xml
@@ -238,7 +238,10 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <!-- Either the AIDL or the HIDL health HAL must exist on the device.
+ If the HIDL health HAL exists, it must be at least version 2.1.
+ See DeviceManifestTest.HealthHal -->
+ <hal format="hidl" optional="true">
<name>android.hardware.health</name>
<version>2.1</version>
<interface>