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

Commit f8d5f0c3 authored by Anna Trostanetski's avatar Anna Trostanetski Committed by Automerger Merge Worker
Browse files

Merge "Revert "Drop GNSS1.1 and Thermal1.0"" into rvc-dev am: 9b0f15d5 

Change-Id: I1a47e27758ad04ad9d128765b477a1e57943ab64
parents 4711132d 9b0f15d5

compatibility_matrices/compatibility_matrix.4.xml

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

compatibility_matrices/compatibility_matrix.current.xml

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