diff options
| -rwxr-xr-x | btif/src/btif_storage.c | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | conf/Android.mk | 18 | ||||
| -rwxr-xr-x | conf/auto_pair_devlist.conf | 27 |
3 files changed, 39 insertions, 8 deletions
diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c index 856df6e..a68f76e 100755 --- a/btif/src/btif_storage.c +++ b/btif/src/btif_storage.c @@ -135,7 +135,7 @@ #define BTIF_STORAGE_KEY_ADAPTER_DISC_TIMEOUT "discovery_timeout" -#define BTIF_AUTO_PAIR_CONF_FILE "/etc/bluetooth/auto_pairing.conf" +#define BTIF_AUTO_PAIR_CONF_FILE "/etc/bluetooth/auto_pair_devlist.conf" #define BTIF_STORAGE_PATH_AUTOPAIR_BLACKLIST "auto_pair_blacklist" #define BTIF_STORAGE_KEY_AUTOPAIR_BLIACKLIST_ADDR "AddressBlacklist" #define BTIF_STORAGE_KEY_AUTOPAIR_BLIACKLIST_EXACTNAME "ExactNameBlacklist" diff --git a/conf/Android.mk b/conf/Android.mk index 63e3c7c..816757f 100644..100755 --- a/conf/Android.mk +++ b/conf/Android.mk @@ -1,24 +1,27 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) - LOCAL_MODULE := bt_stack.conf LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth - - LOCAL_MODULE_TAGS := eng - LOCAL_SRC_FILES := $(LOCAL_MODULE) +include $(BUILD_PREBUILT) +include $(CLEAR_VARS) LOCAL_MODULE := bt_did.conf LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth - LOCAL_MODULE_TAGS := eng +LOCAL_SRC_FILES := $(LOCAL_MODULE) +include $(BUILD_PREBUILT) -LOCAL_SRC_FILES := bt_did.conf - +include $(CLEAR_VARS) +LOCAL_MODULE := auto_pair_devlist.conf +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth +LOCAL_MODULE_TAGS := eng +LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) ifeq ($(TARGET_PRODUCT), full_maguro) @@ -33,3 +36,4 @@ endif ifeq ($(TARGET_PRODUCT), full_wingray) include $(LOCAL_PATH)/moto/wingray/Android.mk endif + diff --git a/conf/auto_pair_devlist.conf b/conf/auto_pair_devlist.conf new file mode 100755 index 0000000..1e25592 --- /dev/null +++ b/conf/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) +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 + +# 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 + +# 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 |