bluetooth: switch to btlinux

BoardConfig.mk

@@ -26,9 +26,7 @@ TARGET_2ND_CPU_VARIANT := cortex-a72
 
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
-BOARD_CUSTOM_BT_CONFIG := $(DEVICE_PATH)/bluetooth/vnd_rpi4.txt
 BOARD_HAVE_BLUETOOTH := true
-BOARD_HAVE_BLUETOOTH_BCM := true
 
 # Camera
 BOARD_LIBCAMERA_IPAS := raspberrypi

bluetooth/vnd_rpi4.txt

@@ -1,14 +0,0 @@
-BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyAMA0"
-FW_PATCHFILE_LOCATION = "/vendor/firmware/brcm/"
-FW_PATCH_SETTLEMENT_DELAY_MS = 200
-BT_WAKE_VIA_PROC = FALSE
-BT_WAKE_VIA_USERIAL_IOCTL = FALSE
-LPM_IDLE_TIMEOUT_MULTIPLE = 5
-SCO_CFG_INCLUDED = FALSE
-SCO_PCM_IF_CLOCK_RATE = 2
-BTVND_DBG = FALSE
-BTHW_DBG = FALSE
-VNDUSERIAL_DBG = FALSE
-UPIO_DBG = FALSE
-UART_TARGET_BAUD_RATE = 3000000
-USE_CONTROLLER_BDADDR = FALSE

boot/config.txt

@@ -8,6 +8,9 @@ initramfs ramdisk.img followkernel
 # Audio
 dtparam=audio=on
 
+# Bluetooth
+dtparam=krnbt=on
+
 # Camera
 camera_auto_detect=1
 start_x=1

device.mk

@@ -71,9 +71,7 @@ PRODUCT_COPY_FILES += \
 
 # Bluetooth
 PRODUCT_PACKAGES += \
-    android.hardware.bluetooth@1.0-impl \
+    android.hardware.bluetooth@1.1-service.btlinux
-    android.hardware.bluetooth@1.0-service \
-    libbt-vendor
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \

manifest.xml

@@ -20,7 +20,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>

ramdisk/ueventd.rpi4.rc

@@ -1,7 +1,5 @@
 # Bluetooth
-/dev/ttyAMA0                                                                 0660   bluetooth  bluetooth
 /dev/rfkill                                                                  0660   bluetooth  bluetooth
-/dev/vcio                                                                    0660   system     bluetooth
 
 # Camera
 /dev/media*                                                                  0660   system     camera

sepolicy/bluetooth.te

@@ -1 +0,0 @@
-allow bluetooth vcio_device:chr_file rw_file_perms;

sepolicy/device.te

@@ -1,2 +1 @@
 type cec_device, dev_type;
-type vcio_device, dev_type, mlstrustedobject;

sepolicy/file_contexts

@@ -1,6 +1,4 @@
 # Bluetooth
-/dev/ttyAMA0                                                                 u:object_r:hci_attach_dev:s0
-/dev/vcio                                                                    u:object_r:vcio_device:s0
 /sys/class/rfkill/rfkill[0-9]/state                                          u:object_r:sysfs_bluetooth_writable:s0
 
 # CEC

vendor.prop

@@ -31,7 +31,6 @@ bluetooth.profile.pbap.server.enabled?=true
 bluetooth.profile.sap.server.enabled?=true
 bluetooth.profile.vcp.controller.enabled?=true
 persist.bluetooth.a2dp_aac.vbr_supported=true
-ro.rfkilldisabled=1
 
 # Camera
 media.settings.xml=/vendor/etc/media_profiles_V1_0.xml