Merge "Revert "Drop GNSS1.1 and Thermal1.0"" into rvc-dev

This commit is contained in:
Anna Trostanetski 2020-03-23 11:58:12 +00:00 committed by Android (Google) Code Review
commit 9b0f15d5e1
2 changed files with 14 additions and 0 deletions

View file

@ -181,6 +181,12 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.gnss</name>
<!--
- Both versions are listed here as a workaround for libvintf since 2.0 extends 1.1.
- Devices launched with Q must support gnss@2.0, see VtsTrebleVendorVintfTest
- test DeviceManifestTest#GnssHalVersionCompatibility.
-->
<version>1.1</version>
<version>2.0</version>
<interface>
<name>IGnss</name>
@ -423,6 +429,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.thermal</name>
<version>1.0-1</version>
<version>2.0</version>
<interface>
<name>IThermal</name>

View file

@ -209,6 +209,12 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.gnss</name>
<!--
- Both versions are listed here as a workaround for libvintf since 2.0 extends 1.1.
- Devices launched with Q must support gnss@2.0, see VtsTrebleVendorVintfTest
- test DeviceManifestTest#GnssHalVersionCompatibility.
-->
<version>1.1</version>
<version>2.0-1</version>
<interface>
<name>IGnss</name>
@ -464,6 +470,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.thermal</name>
<version>1.0</version>
<version>2.0</version>
<interface>
<name>IThermal</name>