diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2019-11-06 10:25:55 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2019-11-16 08:35:19 -0700 |
| commit | 0013928ff66c7b2c1949dc289e1064ec888835ca (patch) | |
| tree | 0bb3334233b5bb97a3c62aa3739b75d46cfce27b | |
| parent | c5eb82047184ba58e33423d9b605395e26464852 (diff) | |
| parent | ae35d7765dc6f30ae3cca8a1af10a90ca380f7fd (diff) | |
| download | android_system_bt-lineage-17.0.tar.gz android_system_bt-lineage-17.0.tar.bz2 android_system_bt-lineage-17.0.zip | |
Merge tag 'android-10.0.0_r11' into lineage-17.0lineage-17.0
Android 10.0.0 release 11
Change-Id: I0f8e9557534fdf347ba950b5ec7bd85fc699258f
| -rw-r--r-- | btif/include/btif_dm.h | 2 | ||||
| -rw-r--r-- | btif/src/btif_dm.cc | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/btif/include/btif_dm.h b/btif/include/btif_dm.h index a9cb2287e..a9d4cb6c4 100644 --- a/btif/include/btif_dm.h +++ b/btif/include/btif_dm.h @@ -100,7 +100,7 @@ void btif_dm_load_ble_local_keys(void); 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); diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc index 1f5cb8236..67a059ecf 100644 --- a/btif/src/btif_dm.cc +++ b/btif/src/btif_dm.cc @@ -2883,7 +2883,7 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 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 @@ void btif_dm_get_ble_local_keys(tBTA_DM_BLE_LOCAL_KEY_MASK* p_key_mask, 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, |