commit 3e8755eca7a61ac580a197697e0217e7c1681eb6
author Andre Eisenbach <eisenbach@google.com> Thu Nov 05 15:38:36 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Nov 05 17:35:29 2015 -0800
tree 29564f5b7e2e6bbb5528d1fdd2415f4e83abc7a3
parent 903777dd5349218d115542c28639546ecccd869f

Always update remote address type during LE scan

This will ensure that devices which do not contain a device name in the
advertising record are stored with the correct address type to ensure
re-connection to the device succeeds.

Bug: 25499163
Change-Id: I85f18ce2de267844c5d5ed49beeb448b9b074d74

btif/src/btif_gatt_client.c

diff --git a/btif/src/btif_gatt_client.c b/btif/src/btif_gatt_client.c
index f70f2bb..c371b0d 100644
--- a/btif/src/btif_gatt_client.c
+++ b/btif/src/btif_gatt_client.c
@@ -458,8 +458,6 @@
         btif_dm_update_ble_remote_properties( p_btif_cb->bd_addr.address,   bdname.name,
                                                p_btif_cb->device_type);
     }
-
-    btif_storage_set_remote_addr_type( &p_btif_cb->bd_addr, p_btif_cb->addr_type);
 }
 
 static void btif_gattc_upstreams_evt(uint16_t event, char* p_param)
@@ -644,6 +642,8 @@
                         BT_PROPERTY_TYPE_OF_DEVICE, sizeof(dev_type), &dev_type);
              btif_storage_set_remote_device_property(&(p_btif_cb->bd_addr), &properties);
 
+            btif_storage_set_remote_addr_type( &p_btif_cb->bd_addr, p_btif_cb->addr_type);
+
             HAL_CBACK(bt_gatt_callbacks, client->scan_result_cb,
                       &p_btif_cb->bd_addr, p_btif_cb->rssi, p_btif_cb->value);
             break;