summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxkeita <keita_nya@live.jp>2017-05-22 07:10:53 +0000
committerSteven Lay <arbiter1000@gmail.com>2017-06-06 01:24:20 +0000
commit814539ca8c1155b11cea7a557deb27605cf4b7c2 (patch)
tree70fa55e25ea6f6ab0d148caefc8e1ad54fc90685
parent2e3db9e9e731a88a0a72d5ea6e8eeeff24ea552b (diff)
shinano-common: Fix Bluetooth Voice Calls
- Remove BTA timer delay and IOCTL false flag - Hardcode vnd_shinano.txt path Change-Id: Ife81025c3ce0ac535bdf0883ecd225422e7ea80c
-rw-r--r--BoardConfigCommon.mk2
-rw-r--r--bluetooth/bdroid_buildcfg.h3
-rw-r--r--bluetooth/vnd_shinano.txt (renamed from bluetooth/vnd_generic.txt)2
3 files changed, 2 insertions, 5 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 6f208ca..7584353 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -42,7 +42,7 @@ BOARD_HAVE_BCM_FM := true
BOARD_HAVE_BLUETOOTH := true
BOARD_HAVE_BLUETOOTH_BCM := true
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/sony/shinano-common/bluetooth
-BOARD_CUSTOM_BT_CONFIG := $(DEVICE_PATH)/bluetooth/vnd_generic.txt
+BOARD_CUSTOM_BT_CONFIG := device/sony/shinano-common/bluetooth/vnd_shinano.txt
# CM Hardware
BOARD_HARDWARE_CLASS += device/sony/shinano-common/cmhw
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 297c49a..08219a1 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -18,9 +18,6 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
-#define BTA_DISABLE_DELAY 100 /* in milliseconds */
-#define HCILP_INCLUDED FALSE
-#define BT_WAKE_VIA_USERIAL_IOCTL FALSE
#define BTM_WBS_INCLUDED TRUE
/* Defined if the kernel does not have support for CLOCK_BOOTTIME_ALARM */
diff --git a/bluetooth/vnd_generic.txt b/bluetooth/vnd_shinano.txt
index 31b1ff8..e076a9d 100644
--- a/bluetooth/vnd_generic.txt
+++ b/bluetooth/vnd_shinano.txt
@@ -15,4 +15,4 @@ SCO_I2SPCM_IF_ROLE = 0
BTVND_DBG = FALSE
BTHW_DBG = TRUE
VNDUSERIAL_DBG = FALSE
-UPIO_DBG = FALSE
+UPIO_DBG = FALSE \ No newline at end of file