From 6e31d8db91317b5339e7b959dca8069a0aa05f88 Mon Sep 17 00:00:00 2001
From: Martin Yan <mingyiyan@google.com>
Date: Wed, 22 Jan 2025 05:34:20 +0000
Subject: [PATCH] Adjust the version set in manifest xml and matrix xml

Bug: 361443653
Test: m and build pass
Flag: EXEMPT, this feature is related to CS which is controlled
      by com.android.bluetooth.flags.channel_sounding_in_stack
Change-Id: I2f2f46cfd15ce0104a6309c8032f7f4ef5ba267a
---
 bcmbt/bluetooth.mk             | 2 +-
 bcmbt/compatibility_matrix.xml | 2 +-
 bcmbt/manifest_bluetooth.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bcmbt/bluetooth.mk b/bcmbt/bluetooth.mk
index 18c066b..a2fb3ab 100644
--- a/bcmbt/bluetooth.mk
+++ b/bcmbt/bluetooth.mk
@@ -4,7 +4,7 @@ PRODUCT_PACKAGES += \
        android.hardware.bluetooth.finder-V1-ndk.so \
        android.hardware.bluetooth.ranging-V1-ndk.so \
        android.hardware.bluetooth-service.bcmbtlinux \
-       vendor.google.bluetooth_ext-V1-ndk.so \
+       vendor.google.bluetooth_ext-V3-ndk.so \
        bt_vendor.conf \
        android.hardware.bluetooth.prebuilt.xml \
        android.hardware.bluetooth_le.prebuilt.xml
diff --git a/bcmbt/compatibility_matrix.xml b/bcmbt/compatibility_matrix.xml
index 54eda4b..47928f4 100644
--- a/bcmbt/compatibility_matrix.xml
+++ b/bcmbt/compatibility_matrix.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework">
     <hal format="aidl" optional="true">
         <name>vendor.google.bluetooth_ext</name>
-        <version>1</version>
+        <version>1-3</version>
         <interface>
             <name>IBluetoothFinder</name>
             <instance>default</instance>
diff --git a/bcmbt/manifest_bluetooth.xml b/bcmbt/manifest_bluetooth.xml
index 3dc3f88..54e5541 100644
--- a/bcmbt/manifest_bluetooth.xml
+++ b/bcmbt/manifest_bluetooth.xml
@@ -16,7 +16,7 @@
     </hal>
     <hal format="aidl">
         <name>vendor.google.bluetooth_ext</name>
-        <version>1</version>
+        <version>3</version>
         <fqname>IBTChannelAvoidance/default</fqname>
         <fqname>IBluetoothCcc/default</fqname>
         <fqname>IBluetoothEwp/default</fqname>