Merge "health: AIDL HAL may replace HIDL HAL."
This commit is contained in:
commit
199b85ed07
4 changed files with 16 additions and 4 deletions
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
Loading…
Reference in a new issue