From 2162c82bb571f99e98aaa0f1e4dbe8eb7c3f7cfa Mon Sep 17 00:00:00 2001
From: Josh Wu <joshwu@google.com>
Date: Sat, 1 Oct 2022 14:03:36 +0100
Subject: [PATCH] rosemary: Switch BtAudio to AIDL Test: m Bug: 203490261
 Change-Id: I4b8ac40d5ad410b89eb6a0573d740d86471ecfc7 Merged-In:
 I4b8ac40d5ad410b89eb6a0573d740d86471ecfc7

Change-Id: I3c3e1bfad896d1c401bcb158c6921c0bae8c58f1
---
 device.mk    | 2 +-
 manifest.xml | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/device.mk b/device.mk
index 22b8128..23b82a8 100644
--- a/device.mk
+++ b/device.mk
@@ -43,7 +43,7 @@ PRODUCT_PACKAGES += \
     android.hardware.audio.service.mediatek \
     android.hardware.audio@6.0-impl \
     android.hardware.audio.effect@6.0-impl \
-    android.hardware.bluetooth.audio@2.1-impl
+    android.hardware.bluetooth.audio-impl
 
 PRODUCT_PACKAGES += \
     audio.a2dp.default \
diff --git a/manifest.xml b/manifest.xml
index 8e4fa36..98a5228 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -14,11 +14,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.0::IBluetoothHci/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth.audio</name>
-        <transport>hwbinder</transport>
-        <fqname>@2.1::IBluetoothAudioProvidersFactory/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.boot</name>
         <transport>hwbinder</transport>