kona-common : add vendor conf and fix bluetooth

Change-Id: Iac0f1e4a728c00b244de8f311eeae761fee9da26

4 files changed, 165 insertions, 0 deletions

diff --git a/bluetooth/auto_pair_devlist.conf b/bluetooth/auto_pair_devlist.conf
new file mode 100755
index 0000000..f15009c
--- /dev/null
+++ b/bluetooth/auto_pair_devlist.conf
@@ -0,0 +1,27 @@
+# Do NOT change this file format without updating the parsing logic in
+# BT IF module implementation (btif_storage.c)
+
+# This file contains information to prevent auto pairing with Bluetooth devices.
+# Blacklisting by vendor prefix address:
+# The following companies are included in the list below:
+# ALPS (lexus), Murata (Prius 2007, Nokia 616), TEMIC SDS (Porsche, Audi),
+# Parrot, Zhongshan General K-mate Electronics, Great Well
+# Electronics, Flaircomm Electronics, Jatty Electronics, Delphi,
+# Clarion, Novero, Denso (Lexus, Toyota), Johnson Controls (Acura),
+# Continental Automotive, Harman/Becker, Panasonic/Kyushu Ten,
+# BMW (Motorola PCS), Visteon, Peugeot, BMW (MINI10013), Venza (Toyota)
+AddressBlacklist=00:02:C7,00:16:FE,00:19:C1,00:1B:FB,00:1E:3D,00:21:4F,00:23:06,00:24:33,00:A0:79,00:0E:6D,00:13:E0,00:21:E8,00:60:57,00:0E:9F,00:12:1C,00:18:91,00:18:96,00:13:04,00:16:FD,00:22:A0,00:0B:4C,00:60:6F,00:23:3D,00:C0:59,00:0A:30,00:1E:AE,00:1C:D7,00:80:F0,00:12:8A,00:09:93,00:80:37,00:26:7E,08:76:95,00:1E:B2,00:26:E8,60:38:0E
+
+# Blacklisting by Exact Name:
+ExactNameBlacklist=Motorola IHF1000,i.TechBlueBAND,X5 Stereo v1.3,KML_CAN
+
+# Blacklisting by Partial Name (if name starts with)
+PartialNameBlacklist=BMW,Audi,Parrot,Car,CAR
+
+# Fixed PIN keyboard blacklist. Keyboards should have variable PIN
+# The keyboards below have a fixed PIN of 0000, so we will auto pair.
+# Note the reverse logic in this case compared to other's in this file
+# where its a blacklist for not auto pairing.
+FixedPinZerosKeyboardBlacklist=00:0F:F6
+
+# Blacklisting by addition of the address during usage
diff --git a/bluetooth/bt_did.conf b/bluetooth/bt_did.conf
new file mode 100755
index 0000000..c882e83
--- /dev/null
+++ b/bluetooth/bt_did.conf
@@ -0,0 +1,96 @@
+# Device ID (DID) configuration
+[DID]
+
+# Record Number: 1, 2 or 3 - maximum of 3 records
+recordNumber = 1
+
+# Primary Record - true or false (default)
+# There can be only one primary record
+primaryRecord = true
+
+# Vendor ID '0xFFFF' indicates no Device ID Service Record is present in the device
+# 0x000F = Broadcom Corporation (default)
+# 0x0075 = Samsung Electronics Co. Ltd.
+vendorId = 0x0075
+
+# Vendor ID Source
+# 0x0001 = Bluetooth SIG assigned Device ID Vendor ID value (default)
+# 0x0002 = USB Implementer’s Forum assigned Device ID Vendor ID value
+#vendorIdSource = 0x0001
+
+# Product ID & Product Version
+# Per spec DID v1.3 0xJJMN for version is interpreted as JJ.M.N
+# JJ: major version number, M: minor version number, N: sub-minor version number
+# For example: 1200, v14.3.6
+# Version bluez : 0x0100 , bluedroid : 0x0200
+productId = 0x0100
+version = 0x0200
+
+# Optional attributes
+#clientExecutableURL =
+#serviceDescription =
+#documentationURL =
+
+#=================================================================================================#
+# Device ID (DID) configuration
+[DID]
+
+# Record number: 1, 2 or 3 - maximum of 3 records
+#recordNumber = 2
+
+# Primary Record - true or false (default)
+# There can be only one primary record
+#primaryRecord = false
+
+# Vendor ID '0xFFFF' indicates no Device ID Service Record is present in the device
+# 0x000F = Broadcom Corporation (default)
+#vendorId = 0x000F
+
+# Vendor ID Source
+# 0x0001 = Bluetooth SIG assigned Device ID Vendor ID value (default)
+# 0x0002 = USB Implementer’s Forum assigned Device ID Vendor ID value
+#vendorIdSource = 0x0001
+
+# Product ID & Product Version
+# Per spec DID v1.3 0xJJMN for version is interpreted as JJ.M.N
+# JJ: major version number, M: minor version number, N: sub-minor version number
+# Default: 0x0000, v00.0.0
+#productId = 0x0000
+#version = 0x0000
+
+# Optional attributes
+#clientExecutableURL =
+#serviceDescription =
+#documentationURL =
+
+#=================================================================================================#
+# Device ID (DID) configuration
+[DID]
+
+# Record number: 1, 2 or 3 - maximum of 3 records
+#recordNumber = 3
+
+# Primary Record - true or false (default)
+# There can be only one primary record
+#primaryRecord = false
+
+# Vendor ID '0xFFFF' indicates no Device ID Service Record is present in the device
+# 0x000F = Broadcom Corporation (default)
+#vendorId = 0x000F
+
+# Vendor ID Source
+# 0x0001 = Bluetooth SIG assigned Device ID Vendor ID value (default)
+# 0x0002 = USB Implementer’s Forum assigned Device ID Vendor ID value
+#vendorIdSource = 0x0001
+
+# Product ID & Product Version
+# Per spec DID v1.3 0xJJMN for version is interpreted as JJ.M.N
+# JJ: major version number, M: minor version number, N: sub-minor version number
+# Default: 0x0000, v00.0.0
+#productId = 0x0000
+#version = 0x0000
+
+# Optional attributes
+#clientExecutableURL =
+#serviceDescription =
+#documentationURL =
diff --git a/bluetooth/bt_stack.conf b/bluetooth/bt_stack.conf
new file mode 100755
index 0000000..d5ee9a8
--- /dev/null
+++ b/bluetooth/bt_stack.conf
@@ -0,0 +1,36 @@
+# Enable BtSnoop logging function
+# valid value : true, false
+BtSnoopLogOutput=true
+
+# BtSnoop log output file
+BtSnoopFileName=/sdcard/Android/data/btsnoop_hci.log
+
+# Enable trace level reconfiguration function
+# Must be present before any TRC_ trace level settings
+TraceConf=true
+
+# Trace level configuration
+#   BT_TRACE_LEVEL_NONE    0    ( No trace messages to be generated )
+#   BT_TRACE_LEVEL_ERROR   1    ( Error condition trace messages )
+#   BT_TRACE_LEVEL_WARNING 2    ( Warning condition trace messages )
+#   BT_TRACE_LEVEL_API     3    ( API traces )
+#   BT_TRACE_LEVEL_EVENT   4    ( Debug messages for events )
+#   BT_TRACE_LEVEL_DEBUG   5    ( Full debug messages )
+#   BT_TRACE_LEVEL_VERBOSE 6    ( Verbose messages ) - Currently supported for TRC_BTAPP only.
+TRC_BTM=3
+TRC_HCI=2
+TRC_L2CAP=4
+TRC_RFCOMM=3
+TRC_OBEX=2
+TRC_AVCT=2
+TRC_AVDT=2
+TRC_AVRC=2
+TRC_AVDT_SCB=2
+TRC_AVDT_CCB=2
+TRC_A2D=2
+TRC_SDP=4
+TRC_GATT=2
+TRC_SMP=2
+TRC_BTAPP=4
+TRC_BTIF=4
+TRC_PROTOCOL=3
diff --git a/kona-common.mk b/kona-common.mk
index c9e8d13..07520ba 100755
--- a/kona-common.mk
+++ b/kona-common.mk
@@ -49,6 +49,12 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/nvram_net.txt_murata:system/etc/wifi/nvram_net.txt_murata \
     $(LOCAL_PATH)/configs/80mac:system/etc/init.d/80mac
 
+# Bluetooth
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/bluetooth/auto_pair_devlist.conf:system/etc/bluetooth/auto_pair_devlist.conf \
+    $(LOCAL_PATH)/bluetooth/bt_did.conf:system/etc/bluetooth/bt_did.conf \
+    $(LOCAL_PATH)/bluetooth/bt_stack.conf:system/etc/bluetooth/bt_stack.conf
+
 # Charger
  PRODUCT_PACKAGES += \
     charger_res_images