commit 64c5479fc050c537ef6d39625de2032c77fc5676
author Matthew Xie <mattx@google.com> Tue Sep 16 00:55:03 2014 -0700
committer Matthew Xie <mattx@google.com> Wed Sep 17 13:49:50 2014 -0700
tree 03ceff537fcf69e0e9833206e34deeb7e4c3e72f
parent 53c9fd05c28d035cf3d2530b586d3d02b68a9866

For pairing over le transport, set default device type and address type

When the LE pairing is initiated over NFC, skipping device scan, there is
no device type or address type info. We set the default as le and public.
bug 17497942
Change-Id: I3dcbb9029ead6ea0f7c48e62f46c8a055f1bc293

btif/src/btif_dm.c

diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index d85867f..6bf6648 100644
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -598,6 +598,17 @@
     int addr_type;
     bdstr_t bdstr;
     bd2str(bd_addr, &bdstr);
+    if (transport == BT_TRANSPORT_LE)
+    {
+        if (!btif_config_get_int("Remote", (char const *)&bdstr,"DevType", &device_type))
+        {
+            btif_config_set_int("Remote", bdstr, "DevType", BT_DEVICE_TYPE_BLE);
+        }
+        if (btif_storage_get_remote_addr_type(bd_addr, &addr_type) != BT_STATUS_SUCCESS)
+        {
+            btif_storage_set_remote_addr_type(bd_addr, BLE_ADDR_PUBLIC);
+        }
+    }
     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)) || (transport == BT_TRANSPORT_LE))