From 737725ba27450519daf23a6688e939ed31acd127 Mon Sep 17 00:00:00 2001
From: Joe Tessler <jrt@google.com>
Date: Tue, 10 Dec 2024 04:03:27 +0000
Subject: [PATCH] Support IAudioExtension AIDL v4 and v5

We unfroze the v4 IAudioExtension AIDL API and modified it in
ag/30424231 and incremented the version to v5 in ag/30702418 to fix the
tests. This broke the -next builds, which expected the previously frozen
version (v4).

This change modifies the compatibility matrix to support both v4 and v5.
This fixes both the local tests and -next builds.

Bug: 378303588
Bug: 383213634
Test: atest vts_treble_vintf_vendor_test
Flag: vendor.google.whitechapel.audio.flags.enable_always_available_display
Change-Id: I467434ccb41ab71dc1b230e64dc09fc0959a8b8a
---
 audio/aidl/device_framework_matrix_product.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/aidl/device_framework_matrix_product.xml b/audio/aidl/device_framework_matrix_product.xml
index 3bb4130..50b850f 100644
--- a/audio/aidl/device_framework_matrix_product.xml
+++ b/audio/aidl/device_framework_matrix_product.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework">
     <hal format="aidl">
         <name>vendor.google.whitechapel.audio.extension</name>
-        <version>5</version>
+        <version>4-5</version>
         <interface>
             <name>IAudioExtension</name>
             <instance>default</instance>