8 files changed, 61 insertions, 92 deletions
diff --git a/bluetooth/auto_pair_devlist.conf b/bluetooth/auto_pair_devlist.conf
index f15009c..f15009c 100755..100644
--- a/bluetooth/auto_pair_devlist.conf
+++ b/bluetooth/auto_pair_devlist.conf
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index d2edb8a..86f57a4 100755..100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
- * Copyright (C) 2012 The CyanogenMod Project <http://www.cyanogenmod.org>
+ * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2016 The CyanogenMod Project <http://www.cyanogenmod.org>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,6 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
-#define BTM_DEF_LOCAL_NAME   "Galaxy Note 8.0"
-
-#define BTIF_HF_SERVICES (BTA_HSP_SERVICE_MASK)
-#define BTIF_HF_SERVICE_NAMES  { BTIF_HSAG_SERVICE_NAME }
-#define PAN_NAP_DISABLED TRUE
-#define BLE_INCLUDED TRUE
-#define BTA_GATT_INCLUDED TRUE
-#define SMP_INCLUDED TRUE
+#define BTM_DEF_LOCAL_NAME "Samsung Galaxy Note 8.0"
 
 #endif
diff --git a/bluetooth/bt_config.conf b/bluetooth/bt_config.conf
new file mode 100644
index 0000000..88ff038
--- /dev/null
+++ b/bluetooth/bt_config.conf
@@ -0,0 +1,15 @@
+[Adapter]
+Address = 78:52:1a:bd:7b:58
+LE_LOCAL_KEY_IR = 6fd11e4abb20eb76e9f4bbf0b96966b3
+LE_LOCAL_KEY_IRK = c074460cb2764619ee82bec6d1a2d0c6
+LE_LOCAL_KEY_DHK = c6bb056da0cad056546499deadea0ea3
+LE_LOCAL_KEY_ER = 3622607506732dec562c6062d1f74000
+ScanMode = 0
+DiscoveryTimeout = 120
+
+[AutoPairBlacklist]
+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
+ExactNameBlacklist = Motorola IHF1000,i.TechBlueBAND,X5 Stereo v1.3,KML_CAN
+PartialNameBlacklist = BMW,Audi,Parrot,Car,CAR
+FixedPinZerosKeyboardBlacklist = 00:0F:F6
+
diff --git a/bluetooth/bt_did.conf b/bluetooth/bt_did.conf
index c882e83..f2f5817 100755..100644
--- a/bluetooth/bt_did.conf
+++ b/bluetooth/bt_did.conf
@@ -1,8 +1,5 @@
 # Device ID (DID) configuration
-[DID]
-
-# Record Number: 1, 2 or 3 - maximum of 3 records
-recordNumber = 1
+[DID1]
 
 # Primary Record - true or false (default)
 # There can be only one primary record
@@ -13,11 +10,6 @@ primaryRecord = true
 # 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
@@ -26,71 +18,3 @@ vendorId = 0x0075
 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
index d5ee9a8..e6f7a65 100755..100644
--- a/bluetooth/bt_stack.conf
+++ b/bluetooth/bt_stack.conf
@@ -1,12 +1,9 @@
-# Enable BtSnoop logging function
-# valid value : true, false
+BtSnoopConfigFromFile=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
diff --git a/bluetooth/bt_vendor.conf b/bluetooth/bt_vendor.conf
new file mode 100644
index 0000000..d42fe6a
--- /dev/null
+++ b/bluetooth/bt_vendor.conf
@@ -0,0 +1,9 @@
+# UART device port where Bluetooth controller is attached
+UartPort = /dev/ttySAC0
+
+# Firmware patch file location
+FwPatchFilePath = /system/bin
+
+# Firmware patch file name
+FwPatchFileName = bcm4334.hcd
+
diff --git a/bluetooth/iot_devlist.conf b/bluetooth/iot_devlist.conf
new file mode 100644
index 0000000..8fdf39a
--- /dev/null
+++ b/bluetooth/iot_devlist.conf
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *        * Redistributions in binary form must reproduce the above copyright
+ *            notice, this list of conditions and the following disclaimer in the
+ *            documentation and/or other materials provided with the distribution.
+ *        * Neither the name of The Linux Foundation nor
+ *            the names of its contributors may be used to endorse or promote
+ *            products derived from this software without specific prior written
+ *            permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.    IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+# Place holder for all IOT devices to be blacklisted
+# Blacklist mechanism will detect the device in runtime based on issue condition
+# and black list the device
diff --git a/bluetooth/vnd_kona.txt b/bluetooth/vnd_kona.txt
index bfc2442..bfc2442 100755..100644
--- a/bluetooth/vnd_kona.txt
+++ b/bluetooth/vnd_kona.txt