summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2022-06-07 00:14:35 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2022-06-14 08:24:43 +0000
commitc89f26eb94dfcd3434069bebb0a8f306428ee4cd (patch)
treee1627e17f5850a20cda8177bfd2b98fe1f8f4592
parent9efebb73aab1bebaf9203a243dfdbf7c3ca3742f (diff)
downloadhikey-c89f26eb94dfcd3434069bebb0a8f306428ee4cd.tar.gz
bluetooth: disable BLE_VND_INCLUDED
to work around the bluettoth crash problem reported like this: Abort message: '[FATAL:btm_ble_gap.cc(638)] Check failed: p_vcs_cplt_params->param_len >= BTM_VSC_CHIP_CAPABILITY_RSP_LEN. after the change[1] which sets BLE_VND_INCLUDED to TRUE by default. Test: BT pair and BT earplug on both hikey and hikey960 Note: confirmed that with this change, the bluetooth feature only works with the board build images, it would not work with the GSI image. [1]: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2064248 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: If0b89bb95e436cecbdd4aec8e6aa1f05fe22c1f9
-rw-r--r--bluetooth/bdroid_buildcfg.h22
-rw-r--r--device-common.mk1
2 files changed, 23 insertions, 0 deletions
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
new file mode 100644
index 00000000..2315b3de
--- /dev/null
+++ b/bluetooth/bdroid_buildcfg.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _BDROID_BUILDCFG_H
+#define _BDROID_BUILDCFG_H
+
+#define BLE_VND_INCLUDED FALSE
+
+#endif
diff --git a/device-common.mk b/device-common.mk
index dea852c0..3833ca16 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -274,3 +274,4 @@ PRODUCT_PACKAGES += \
suspend_blocker
TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/linaro/hikey/bluetooth