Merge "Revert "health: require AIDL HAL and deprecate HIDL HAL."" am: 5ad3bb1f87 am: e5f1c03414 am: fd797c42f0 am: 0f385bdb51

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

Change-Id: I7adc5d968de9f0ecf1c9f205c37aeb2630ff7305
This commit is contained in:
Yifan Hong
2021-12-10 22:28:26 +00:00
committed by Automerger Merge Worker

View File

@@ -298,7 +298,16 @@
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="false">
<hal format="hidl" optional="false">
<name>android.hardware.health</name>
<version>2.1</version>
<interface>
<name>IHealth</name>
<instance>default</instance>
</interface>
</hal>
<!-- TODO(b/177269435): require health AIDL HAL and deprecate HIDL HAL -->
<hal format="aidl" optional="true">
<name>android.hardware.health</name>
<version>1</version>
<interface>