commit c1bc145aedab171b4c2c199e6b17e57c59b51605
author Jack He <siyuanh@google.com> Tue Oct 22 03:14:50 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 22 03:14:50 2019 -0700
tree d0677a6ff27ed6c8230356f704facf3842f2fa37
parent 0d16f113d1153663b2d3e5fd14de6b548725de40
parent 1d4c6df162bda1e05e58523dcf50075991d05c11

HCI: Use AddressWithType in various LE connection APIs
am: 1d4c6df162

Change-Id: I8c1bcea5d8d0a2ed607fb124cb71ae1a6b47ce34

btif/include/btif_dm.h

diff --git a/btif/include/btif_dm.h b/btif/include/btif_dm.h
index a9cb228..a9d4cb6 100644
--- a/btif/include/btif_dm.h
+++ b/btif/include/btif_dm.h
@@ -100,7 +100,7 @@
 void btif_dm_get_ble_local_keys(tBTA_DM_BLE_LOCAL_KEY_MASK* p_key_mask,
                                 Octet16* p_er,
                                 tBTA_BLE_LOCAL_ID_KEYS* p_id_keys);
-void btif_dm_save_ble_bonding_keys(void);
+void btif_dm_save_ble_bonding_keys(RawAddress& bd_addr);
 void btif_dm_remove_ble_bonding_keys(void);
 void btif_dm_ble_sec_req_evt(tBTA_DM_BLE_SEC_REQ* p_ble_req);
 

btif/src/btif_dm.cc

diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index 1f5cb82..67a059e 100644
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -2883,7 +2883,7 @@
       btif_storage_remove_bonded_device(&bdaddr);
       state = BT_BOND_STATE_NONE;
     } else {
-      btif_dm_save_ble_bonding_keys();
+      btif_dm_save_ble_bonding_keys(bdaddr);
       btif_dm_get_remote_services_by_transport(&bd_addr, GATT_TRANSPORT_LE);
     }
   } else {
@@ -2964,11 +2964,9 @@
   BTIF_TRACE_DEBUG("%s  *p_key_mask=0x%02x", __func__, *p_key_mask);
 }
 
-void btif_dm_save_ble_bonding_keys(void) {
+void btif_dm_save_ble_bonding_keys(RawAddress& bd_addr) {
   BTIF_TRACE_DEBUG("%s", __func__);
 
-  RawAddress bd_addr = pairing_cb.bd_addr;
-
   if (pairing_cb.ble.is_penc_key_rcvd) {
     btif_storage_add_ble_bonding_key(
         &bd_addr, (uint8_t*)&pairing_cb.ble.penc_key, BTIF_DM_LE_KEY_PENC,