commit 9d2903b2368ab6857fc49f846645f0c558551551
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 05 00:15:35 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 05 00:15:35 2020 +0000
tree 659d8e607693a0cc01816a7f015012fc53a0c777
parent 4d4e2fb0c180882d753dd898744194e18e035383
parent 59657d5db30d4e274e4a77cd38049e021eb28241

Merge "db845c: Wire in bluetooth support"

db845c.mk

diff --git a/db845c.mk b/db845c.mk
index a4984f0..6e360ee 100644
--- a/db845c.mk
+++ b/db845c.mk
@@ -22,6 +22,7 @@
 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

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index a35247d..e9372aa 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -83,7 +83,7 @@
 
 # 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 @@
     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
 

manifest.xml

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>