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

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

diff --git a/device.mk b/device.mk
index 8253a1c..9fbc096 100644
--- a/device.mk
+++ b/device.mk
@@ -77,7 +77,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 \
     audio.bluetooth.default \
     audio.primary.holi \
diff --git a/manifest.xml b/manifest.xml
index 70896bf..373543c 100644
--- a/manifest.xml
+++ b/manifest.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">
         <name>android.hardware.camera.provider</name>
         <transport>hwbinder</transport>