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

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

Change-Id: I74bc15e4baf500d660af0424eb074b70f2a29e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yifan Hong
2022-05-13 21:08:59 +00:00
committed by Automerger Merge Worker
5 changed files with 21 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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

View File

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