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

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

Merge "health: AIDL HAL may replace HIDL HAL." am: 199b85ed 

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

Change-Id: I6eb16556a922c9c85e5c97f35162b9ffa4f8ebd3
parents 6fe71755 199b85ed

compatibility_matrices/compatibility_matrix.3.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,10 @@ 
            <instance>default</instance>

            <instance>default</instance>

        </interface>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <!-- Either the AIDL or the HIDL health HAL must exist on the device.

         If the HIDL health HAL exists, it must be at least version 2.0.

         See DeviceManifestTest.HealthHal -->

    <hal format="hidl" optional="true">

        <name>android.hardware.health</name>

        <name>android.hardware.health</name>

        <version>2.0</version>

        <version>2.0</version>

        <interface>

        <interface>

compatibility_matrices/compatibility_matrix.4.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -213,7 +213,10 @@ 
            <instance>default</instance>

            <instance>default</instance>

        </interface>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <!-- Either the AIDL or the HIDL health HAL must exist on the device.

         If the HIDL health HAL exists, it must be at least version 2.0.

         See DeviceManifestTest.HealthHal -->

    <hal format="hidl" optional="true">

        <name>android.hardware.health</name>

        <name>android.hardware.health</name>

        <version>2.0</version>

        <version>2.0</version>

        <interface>

        <interface>

compatibility_matrices/compatibility_matrix.5.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -238,7 +238,10 @@ 
            <instance>default</instance>

            <instance>default</instance>

        </interface>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <!-- Either the AIDL or the HIDL health HAL must exist on the device.

         If the HIDL health HAL exists, it must be at least version 2.1.

         See DeviceManifestTest.HealthHal -->

    <hal format="hidl" optional="true">

        <name>android.hardware.health</name>

        <name>android.hardware.health</name>

        <version>2.1</version>

        <version>2.1</version>

        <interface>

        <interface>

compatibility_matrices/compatibility_matrix.6.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -268,7 +268,10 @@ 
            <instance>default</instance>

            <instance>default</instance>

        </interface>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <!-- Either the AIDL or the HIDL health HAL must exist on the device.

         If the HIDL health HAL exists, it must be at least version 2.1.

         See DeviceManifestTest.HealthHal -->

    <hal format="hidl" optional="true">

        <name>android.hardware.health</name>

        <name>android.hardware.health</name>

        <version>2.1</version>

        <version>2.1</version>

        <interface>

        <interface>