Merge "health: AIDL HAL may replace HIDL HAL." am: 199b85ed07 am: 072e0f0d4b am: c3787b4d56

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1930724

Change-Id: I2e85f29687644790197dc60148b3981b12fdc1e6
This commit is contained in:
Yifan Hong
2021-12-22 00:40:40 +00:00
committed by Automerger Merge Worker
4 changed files with 16 additions and 4 deletions

View File

@@ -207,7 +207,10 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </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.0.
See DeviceManifestTest.HealthHal -->
<hal format="hidl" optional="true">
<name>android.hardware.health</name> <name>android.hardware.health</name>
<version>2.0</version> <version>2.0</version>
<interface> <interface>

View File

@@ -213,7 +213,10 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </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.0.
See DeviceManifestTest.HealthHal -->
<hal format="hidl" optional="true">
<name>android.hardware.health</name> <name>android.hardware.health</name>
<version>2.0</version> <version>2.0</version>
<interface> <interface>

View File

@@ -238,7 +238,10 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </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> <name>android.hardware.health</name>
<version>2.1</version> <version>2.1</version>
<interface> <interface>

View File

@@ -268,7 +268,10 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </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> <name>android.hardware.health</name>
<version>2.1</version> <version>2.1</version>
<interface> <interface>