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

Commit 05b968c9 authored by Xin Li's avatar Xin Li
Browse files

Merge Coral/Flame into AOSP master 

Bug: 141248619
Change-Id: I4818ef97dfd59ee7573b3c2b84a90559d8dec289
Merged-In: Id56826347023d4ad4c211ad5e39164bc47fdf530
parents e5307a1b 834c416c

system/btif/include/btif_dm.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

system/btif/src/btif_dm.cc

+2 −4
Original line number Diff line number Diff line
@@ -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,