commit e9ff1332e0c74c01be43cbff6daff48a271bcf03
author Andre Eisenbach <eisenbach@google.com> Fri Aug 29 18:17:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 29 18:17:40 2014 +0000
tree 35d11425bf76059e829e13787d1299bb2707ba91
parent 6982ce28d4f154a7bca453ee6fcae20d94cda78c
parent 3baff79dcd63bc33b17f475939d0e282526d9995

Merge "Add LE device to inquiry DB before pairing" into lmp-dev

btif/src/btif_dm.c

diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index a4347e7..d85867f 100644
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -598,9 +598,9 @@
     int addr_type;
     bdstr_t bdstr;
     bd2str(bd_addr, &bdstr);
-    if(btif_config_get_int("Remote", (char const *)&bdstr,"DevType", &device_type) &&
+    if((btif_config_get_int("Remote", (char const *)&bdstr,"DevType", &device_type) &&
        (btif_storage_get_remote_addr_type(bd_addr, &addr_type) == BT_STATUS_SUCCESS) &&
-       (device_type == BT_DEVICE_TYPE_BLE))
+       (device_type == BT_DEVICE_TYPE_BLE)) || (transport == BT_TRANSPORT_LE))
     {
         BTA_DmAddBleDevice(bd_addr->address, addr_type, BT_DEVICE_TYPE_BLE);
     }