Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d08f27b5 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "Copy the keys when re-pairing with a new RPA/IRK" into main

parents 659c15c8 e9765fc8

system/stack/btm/btm_dev.cc

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ void btm_consolidate_dev(tBTM_SEC_DEV_REC* p_target_rec) { 
    if (p_dev_rec->bd_addr == p_target_rec->bd_addr) {

      memcpy(p_target_rec, p_dev_rec, sizeof(tBTM_SEC_DEV_REC));

      p_target_rec->ble = temp_rec.ble;

      p_target_rec->sec_rec.ble_keys = temp_rec.sec_rec.ble_keys;

      p_target_rec->ble_hci_handle = temp_rec.ble_hci_handle;

      p_target_rec->sec_rec.enc_key_size = temp_rec.sec_rec.enc_key_size;

      p_target_rec->conn_params = temp_rec.conn_params;