diff options
| author | Yifan Hong <elsk@google.com> | 2022-05-13 19:46:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-13 19:46:55 +0000 |
| commit | 2eab518ff510c1e72abc6665c3be3752c530ca2a (patch) | |
| tree | 0acf683f64b2b8fd3998d35c06c91185642511d2 /compatibility_matrices | |
| parent | b229ac5fd159f95880aee94265adcb5d8fdc0221 (diff) | |
| parent | 2f5764315b58ffe9da487b7eb5c34ca668eb9568 (diff) | |
Merge "Gralloc: AIDL HAL may replace HIDL HAL." into tm-dev
Diffstat (limited to 'compatibility_matrices')
5 files changed, 21 insertions, 5 deletions
diff --git a/compatibility_matrices/compatibility_matrix.3.xml b/compatibility_matrices/compatibility_matrix.3.xml index 468735d2ba..0964c9964c 100644 --- a/compatibility_matrices/compatibility_matrix.3.xml +++ b/compatibility_matrices/compatibility_matrix.3.xml @@ -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> diff --git a/compatibility_matrices/compatibility_matrix.4.xml b/compatibility_matrices/compatibility_matrix.4.xml index 96f291ff83..8ef0b3ad27 100644 --- a/compatibility_matrices/compatibility_matrix.4.xml +++ b/compatibility_matrices/compatibility_matrix.4.xml @@ -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> diff --git a/compatibility_matrices/compatibility_matrix.5.xml b/compatibility_matrices/compatibility_matrix.5.xml index 3642814f7e..12b85c7724 100644 --- a/compatibility_matrices/compatibility_matrix.5.xml +++ b/compatibility_matrices/compatibility_matrix.5.xml @@ -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> diff --git a/compatibility_matrices/compatibility_matrix.6.xml b/compatibility_matrices/compatibility_matrix.6.xml index 9c42cb0647..e19d2dd12e 100644 --- a/compatibility_matrices/compatibility_matrix.6.xml +++ b/compatibility_matrices/compatibility_matrix.6.xml @@ -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> diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index 84263b6c27..886f7f5b39 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml @@ -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> |