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

Commit 9a3de3cc authored by Yifan Hong's avatar Yifan Hong
Browse files

health: AIDL HAL may replace HIDL HAL. 

Relax the requirement on compatibility matrices
that HIDL health HAL must exist on devices with
target level 3~6, because they may have the AIDL
health HAL instead. Use DeviceManifestTest.HealthHal
to enforce the requirement.

Test: TH
Bug: 211518384
Change-Id: I9f82278bd10e2bd775705041630bcb6f421df8b8
parent f665b8fa

compatibility_matrices/compatibility_matrix.3.xml

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

        </interface>

    </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>

        <version>2.0</version>

        <interface>

compatibility_matrices/compatibility_matrix.4.xml

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

        </interface>

    </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>

        <version>2.0</version>

        <interface>

compatibility_matrices/compatibility_matrix.5.xml

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

        </interface>

    </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>

        <version>2.1</version>

        <interface>

compatibility_matrices/compatibility_matrix.6.xml

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

        </interface>

    </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>

        <version>2.1</version>

        <interface>