From 3da8ff16ce843f85eef35d941c4c394bc50f5aa0 Mon Sep 17 00:00:00 2001 From: Cheney Ni Date: Fri, 7 Jan 2022 17:09:33 +0800 Subject: [PATCH] Bluetooth: update the HAL to be IBluetoothHci @1.1 A build flag TARGET_BLUETOOTH_HCI_V1_1 to control the implementation version Bug: 202113218 Test: pass Bluetooth ON / OFF manually test Change-Id: I42b8e9fede9c38c51a6498df52f514f0841fca17 --- bluetooth/manifest_bluetooth.xml | 2 +- bluetooth/qti_default.mk | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml index d733c24..d9a378e 100644 --- a/bluetooth/manifest_bluetooth.xml +++ b/bluetooth/manifest_bluetooth.xml @@ -2,7 +2,7 @@ android.hardware.bluetooth hwbinder - 1.0 + 1.1 IBluetoothHci default diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 58d6e9e..2484edd 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -23,14 +23,19 @@ BOARD_SEPOLICY_DIRS += device/google/lynx-sepolicy/bluetooth BOARD_HAVE_BLUETOOTH_QCOM = true BOARD_USES_COMMON_BLUETOOTH_HAL = true QCOM_BLUETOOTH_USING_DIAG = false +TARGET_BLUETOOTH_HCI_V1_1 = true TARGET_BLUETOOTH_UART_DEVICE = "/dev/ttySAC18" UART_USE_TERMIOS_AFC = true TARGET_USE_QTI_BT_OBS = true TARGET_USE_QTI_BT_SAR = true TARGET_USE_QTI_BT_CHANNEL_AVOIDANCE = true +ifeq ($(TARGET_BLUETOOTH_HCI_V1_1),true) + PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-impl-qti +else + PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-impl-qti +endif PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0-service-qti \ - android.hardware.bluetooth@1.0-impl-qti \ hardware.google.bluetooth.sar@1.0-impl \ hardware.google.bluetooth.bt_channel_avoidance@1.0-impl