kona-common : bluetooth config files already present in smdk4412-common

Change-Id: I10c8271066bbc5aa7171fe36c86dddd191c63bb0

9 files changed, 0 insertions, 159 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 8988442..ebeac62 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -23,7 +23,6 @@ MALLOC_IMPL := dlmalloc
 
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth
-BOARD_BLUEDROID_VENDOR_CONF := $(LOCAL_PATH)/bluetooth/vnd_kona.txt
 
 # Camera
 COMMON_GLOBAL_CFLAGS += -DCAMERA_WITH_CITYID_PARAM
diff --git a/bluetooth/auto_pair_devlist.conf b/bluetooth/auto_pair_devlist.conf
deleted file mode 100644
index f15009c..0000000
--- a/bluetooth/auto_pair_devlist.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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_config.conf b/bluetooth/bt_config.conf
deleted file mode 100644
index 88ff038..0000000
--- a/bluetooth/bt_config.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[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
deleted file mode 100644
index f2f5817..0000000
--- a/bluetooth/bt_did.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Device ID (DID) configuration
-[DID1]
-
-# 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
-
-# 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
-
diff --git a/bluetooth/bt_stack.conf b/bluetooth/bt_stack.conf
deleted file mode 100644
index e6f7a65..0000000
--- a/bluetooth/bt_stack.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-BtSnoopConfigFromFile=false
-
-BtSnoopLogOutput=true
-
-BtSnoopFileName=/sdcard/Android/data/btsnoop_hci.log
-
-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/bluetooth/bt_vendor.conf b/bluetooth/bt_vendor.conf
deleted file mode 100644
index d42fe6a..0000000
--- a/bluetooth/bt_vendor.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
deleted file mode 100644
index 8fdf39a..0000000
--- a/bluetooth/iot_devlist.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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
deleted file mode 100644
index bfc2442..0000000
--- a/bluetooth/vnd_kona.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-BLUETOOTH_UART_DEVICE_PORT = "/dev/ttySAC0"
-FW_PATCHFILE_LOCATION = "/system/bin"
-LPM_IDLE_TIMEOUT_MULTIPLE = 5
-BTVND_DBG = FALSE
-BTHW_DBG = TRUE
-VNDUSERIAL_DBG = FALSE
-UPIO_DBG = FALSE
-UART_TARGET_BAUD_RATE = 4000000
-FW_PATCH_SETTLEMENT_DELAY_MS = 50
-SCO_USE_I2S_INTERFACE = TRUE
-SCO_I2SPCM_IF_MODE = 1
-SCO_I2SPCM_IF_ROLE = 0
-SCO_I2SPCM_IF_SAMPLE_RATE = 0
-SCO_I2SPCM_IF_CLOCK_RATE = 0
diff --git a/kona-common.mk b/kona-common.mk
index 12335ed..cdabe36 100644
--- a/kona-common.mk
+++ b/kona-common.mk
@@ -52,15 +52,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml
 
-# 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 \
-    $(LOCAL_PATH)/bluetooth/iot_devlist.conf:system/etc/bluetooth/iot_devlist.conf \
-    $(LOCAL_PATH)/bluetooth/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf \
-    $(LOCAL_PATH)/bluetooth/bt_config.conf:data/misc/bluedroid/bt_config.conf
-
 # Camera
 PRODUCT_PACKAGES += \
     camera.smdk4x12