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

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

Merge "Gralloc: AIDL HAL may replace HIDL HAL." into tm-dev am: 2eab518f 

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



Change-Id: I6d10ce5db1d7b0b1201b384a097063e5bc352813
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d8bfe8f 2eab518f

compatibility_matrices/compatibility_matrix.3.xml

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

        </interface>

    </hal>

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

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

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

         See DeviceManifestTest.GrallocHal -->

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

        <name>android.hardware.graphics.allocator</name>

        <version>2.0</version>

        <interface>

compatibility_matrices/compatibility_matrix.4.xml

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

        </interface>

    </hal>

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

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

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

         See DeviceManifestTest.GrallocHal -->

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

        <name>android.hardware.graphics.allocator</name>

        <version>2.0</version>

        <version>3.0</version>

compatibility_matrices/compatibility_matrix.5.xml

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

        </interface>

    </hal>

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

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

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

         See DeviceManifestTest.GrallocHal -->

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

        <name>android.hardware.graphics.allocator</name>

        <!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->

        <version>2.0</version>

compatibility_matrices/compatibility_matrix.6.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 allocator HAL must exist on the device.

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

         See DeviceManifestTest.GrallocHal -->

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

        <name>android.hardware.graphics.allocator</name>

        <!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->

        <version>2.0</version>

compatibility_matrices/compatibility_matrix.current.xml

+5 −1
Original line number Diff line number Diff line
@@ -278,9 +278,13 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

         See DeviceManifestTest.GrallocHal -->

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

        <name>android.hardware.graphics.allocator</name>

        <!-- New, non-Go devices should use 4.0 or the AIDL hal. -->

        <!-- New, non-Go devices should use 4.0 or the AIDL hal.

             See DeviceManifestTest.GrallocVersionCompatibility. -->

        <version>2.0</version>

        <version>3.0</version>

        <version>4.0</version>