diff options
author | Steve Kondik <steve@cyngn.com> | 2015-12-07 19:09:12 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 19:09:12 -0800 |
commit | 99b7a928f879b0330aec915a40d4405a74c9faa1 (patch) | |
tree | e9b3e665ddddae8001017067b9f8065b7a211b21 /device | |
parent | 127a5246ed83109ebbdd5599d367fc4d750d59c7 (diff) | |
parent | 3e8755eca7a61ac580a197697e0217e7c1681eb6 (diff) | |
download | android_system_bt-99b7a928f879b0330aec915a40d4405a74c9faa1.tar.gz android_system_bt-99b7a928f879b0330aec915a40d4405a74c9faa1.tar.bz2 android_system_bt-99b7a928f879b0330aec915a40d4405a74c9faa1.zip |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/system/bt into HEAD
Android 6.0.1 release 3
Change-Id: I2af2b180c6d1779b7a34d1370cb9c759dd2c3506
Diffstat (limited to 'device')
-rw-r--r-- | device/include/interop_database.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/device/include/interop_database.h b/device/include/interop_database.h index e7e0da32c..a0bdae756 100644 --- a/device/include/interop_database.h +++ b/device/include/interop_database.h @@ -46,9 +46,6 @@ static const interop_addr_t interop_addr_database[] = { {{0xac, 0x9e, 0x17, 0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS}, {{0xf0, 0x79, 0x59, 0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS}, - // Polar Heart Rate Monitor - {{0x00, 0x22, 0xd0, 0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS}, - // Motorola Key Link {{0x1c, 0x96, 0x5a, 0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS}, @@ -56,6 +53,8 @@ static const interop_addr_t interop_addr_database[] = { {{0x80, 0xea, 0xCa, 0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS}, // Xiaomi Mi Band {{0x88, 0x0f, 0x10, 0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS}, + // Flic smart button + {{0x80, 0xe4, 0xda, 0x70, 0,0}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS}, // BMW car kits (Harman/Becker) {{0x9c, 0xdf, 0x03, 0,0,0}, 3, INTEROP_AUTO_RETRY_PAIRING}, |