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

This commit is contained in:
Yifan Hong
2020-03-23 19:49:13 +00:00
committed by Android (Google) Code Review
2 changed files with 0 additions and 14 deletions

View File

@@ -181,12 +181,6 @@
</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>
@@ -429,7 +423,6 @@
</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,12 +209,6 @@
</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>
@@ -470,7 +464,6 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.thermal</name>
<version>1.0</version>
<version>2.0</version>
<interface>
<name>IThermal</name>