diff options
| author | Daniel Norman <danielnorman@google.com> | 2022-05-20 13:44:39 -0700 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2022-05-20 13:45:45 -0700 |
| commit | bf238265ab0f44e26b0ac8dd78214ab004387784 (patch) | |
| tree | 3091e6b14d47cda4c2bcde4304de676b3321a6ab /compatibility_matrices | |
| parent | 6e03b1fbcb59a1c7e43a54ea92df61ff4d57d65a (diff) | |
| parent | 40e9d2ec4cf99a621bc4dd41d0a6638359f038b7 (diff) | |
Merge TP1A.220520.001
Change-Id: I5e820e7add5188a4e1f304b438f2b90a53cbccbc
Diffstat (limited to 'compatibility_matrices')
6 files changed, 23 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 272b870efa..5e4bcb4c1c 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 c6c3ee7c69..df594ab2f0 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 58f73a67a9..6ea772fc38 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.7.xml b/compatibility_matrices/compatibility_matrix.7.xml index acee459ca0..26b8d63c5c 100644 --- a/compatibility_matrices/compatibility_matrix.7.xml +++ b/compatibility_matrices/compatibility_matrix.7.xml @@ -142,6 +142,7 @@ </hal> <hal format="aidl" optional="true"> <name>android.hardware.bluetooth.audio</name> + <version>2</version> <interface> <name>IBluetoothAudioProviderFactory</name> <instance>default</instance> diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index bf271994fb..886f7f5b39 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml @@ -142,6 +142,7 @@ </hal> <hal format="aidl" optional="true"> <name>android.hardware.bluetooth.audio</name> + <version>2</version> <interface> <name>IBluetoothAudioProviderFactory</name> <instance>default</instance> @@ -277,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> |