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

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

diff --git a/manifest_yupik.xml b/manifest_yupik.xml
index 1532f78..b0fc874 100644
--- a/manifest_yupik.xml
+++ b/manifest_yupik.xml
@@ -26,15 +26,6 @@
             <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" override="true">
         <name>android.hardware.camera.provider</name>
         <transport>hwbinder</transport>
diff --git a/sm7325.mk b/sm7325.mk
index c91da69..a4279ad 100644
--- a/sm7325.mk
+++ b/sm7325.mk
@@ -94,7 +94,7 @@ PRODUCT_PACKAGES += \
     android.hardware.audio@6.0-impl \
     android.hardware.audio.effect@6.0-impl \
     android.hardware.audio.service \
-    android.hardware.bluetooth.audio@2.1-impl \
+    android.hardware.bluetooth.audio-impl \
     android.hardware.soundtrigger@2.3-impl \
     audioadsprpcd \
     audio.bluetooth.default \