From 59657d5db30d4e274e4a77cd38049e021eb28241 Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Fri, 31 Jan 2020 23:51:58 +0000
Subject: db845c: Wire in bluetooth support

The qca bluetooth module has some yet to be determined issue
which causes deferred firmware loading to stop it from working.

But as long as the bluetooth module is loaded from the vendor
partition where the bluetooth firmware is present, it can be
made to load and function.

This patch updates the bluetooth hal version and adds a trick
to exclude the qca and hci_uart modules from being on the
ramdisk.

Note: Bluetooth audio isn't working yet. Devices pair but I
don't hear audio yet.

Change-Id: I37e927485414368b817958dfef2137fc263003a0
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 db845c.mk        | 3 ++-
 device-common.mk | 6 ++++--
 manifest.xml     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/db845c.mk b/db845c.mk
index a4984f0..6e360ee 100644
--- a/db845c.mk
+++ b/db845c.mk
@@ -22,6 +22,7 @@ ifeq ($(DB845C_USES_GKI), true)
 DB845C_MODS := $(wildcard $(DB845C_KERNEL_DIR)/*.ko)
 ifneq ($(DB845C_MODS),)
   BOARD_VENDOR_KERNEL_MODULES += $(DB845C_MODS)
-  BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(DB845C_MODS)
+  DB845C_ONLY_VENDOR := %/btqca.ko %/hci_uart.ko
+  BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(DB845C_ONLY_VENDOR),$(DB845C_MODS))
 endif
 endif
diff --git a/device-common.mk b/device-common.mk
index f9962d4..2054135 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
 
 # Enable BT
 PRODUCT_PACKAGES += \
-    android.hardware.bluetooth@1.0-service.btlinux
+    android.hardware.bluetooth@1.1-service.btlinux
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
@@ -94,11 +94,13 @@ PRODUCT_PACKAGES += \
     android.hardware.audio@4.0-impl:32 \
     android.hardware.audio.effect@4.0-impl:32 \
     android.hardware.audio@2.0-service \
-    android.hardware.soundtrigger@2.0-impl
+    android.hardware.soundtrigger@2.0-impl \
+    android.hardware.bluetooth.audio@2.0-impl
 
 # Build default bluetooth a2dp and usb audio HALs
 PRODUCT_PACKAGES += \
     audio.a2dp.default \
+    audio.bluetooth.default \
     audio.usb.default \
     audio.r_submix.default
 
diff --git a/manifest.xml b/manifest.xml
index d2d3477..2342860 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -91,7 +91,7 @@
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>IBluetoothHci</name>
             <instance>default</instance>
-- 
cgit v1.2.3