From 43cf637947bacf41b1fa978897edee572a28bb12 Mon Sep 17 00:00:00 2001
From: Josh Wu <joshwu@google.com>
Date: Mon, 24 Jan 2022 22:56:14 -0800
Subject: [PATCH] sm8350-common: Switch BtAudio to AIDL

Test: m
Bug: 203490261
Change-Id: I4b8ac40d5ad410b89eb6a0573d740d86471ecfc7
Merged-In: I4b8ac40d5ad410b89eb6a0573d740d86471ecfc7
---
 common.mk                 | 2 +-
 hidl/manifest_lahaina.xml | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/common.mk b/common.mk
index ce71f84..98b7dca 100644
--- a/common.mk
+++ b/common.mk
@@ -97,7 +97,7 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0.vendor \
-    android.hardware.bluetooth.audio@2.1-impl \
+    android.hardware.bluetooth.audio-impl \
     com.dsi.ant@1.0.vendor \
     vendor.qti.hardware.bluetooth_audio@2.0.vendor \
     vendor.qti.hardware.bluetooth_audio@2.1.vendor \
diff --git a/hidl/manifest_lahaina.xml b/hidl/manifest_lahaina.xml
index 7e03b2d..980e547 100644
--- a/hidl/manifest_lahaina.xml
+++ b/hidl/manifest_lahaina.xml
@@ -494,15 +494,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth.audio</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBluetoothAudioProvidersFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.bluetooth_audio</name>
         <transport>hwbinder</transport>