Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4c21f07 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

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

Change-Id: I8d967578e319aa20d17a9b0535851a54bc545f92
parents a95c962d d32364c7

compatibility_matrices/compatibility_matrix.4.xml

+0 −7
Original line number Diff line number Diff line
@@ -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>

compatibility_matrices/compatibility_matrix.current.xml

+0 −7
Original line number Diff line number Diff line
@@ -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>