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

Commit e4325da5 authored by Chris Manton's avatar Chris Manton
Browse files

Only add btm_ble_enq_resolving_list_pending when privacy not enabled 

Bug: 229199562
Tag: #refactor
Test: gd/cert/run

Change-Id: I37f46b538694dea159e1835b6fd16dd41a3a31d5
parent d4fb5c4f

system/stack/btm/btm_ble_privacy.cc

+5 −7
Original line number Original line Diff line number Diff line
@@ -434,10 +434,9 @@ tBTM_STATUS btm_ble_remove_resolving_list_entry(tBTM_SEC_DEV_REC* p_dev_rec) { 
    BTM_VendorSpecificCommand(HCI_VENDOR_BLE_RPA_VSC,

    BTM_VendorSpecificCommand(HCI_VENDOR_BLE_RPA_VSC,

                              BTM_BLE_META_REMOVE_IRK_LEN, param,

                              BTM_BLE_META_REMOVE_IRK_LEN, param,

                              btm_ble_resolving_list_vsc_op_cmpl);

                              btm_ble_resolving_list_vsc_op_cmpl);

  }



    btm_ble_enq_resolving_list_pending(p_dev_rec->bd_addr,

    btm_ble_enq_resolving_list_pending(p_dev_rec->bd_addr,

                                       BTM_BLE_META_REMOVE_IRK_ENTRY);

                                       BTM_BLE_META_REMOVE_IRK_ENTRY);

  }

  return BTM_CMD_STARTED;

  return BTM_CMD_STARTED;

}

}
@@ -495,11 +494,10 @@ bool btm_ble_read_resolving_list_entry(tBTM_SEC_DEV_REC* p_dev_rec) { 




    BTM_VendorSpecificCommand(HCI_VENDOR_BLE_RPA_VSC, BTM_BLE_META_READ_IRK_LEN,

    BTM_VendorSpecificCommand(HCI_VENDOR_BLE_RPA_VSC, BTM_BLE_META_READ_IRK_LEN,

                              param, btm_ble_resolving_list_vsc_op_cmpl);

                              param, btm_ble_resolving_list_vsc_op_cmpl);

  }





    btm_ble_enq_resolving_list_pending(p_dev_rec->bd_addr,

    btm_ble_enq_resolving_list_pending(p_dev_rec->bd_addr,

                                       BTM_BLE_META_READ_IRK_ENTRY);

                                       BTM_BLE_META_READ_IRK_ENTRY);



  }

  return true;

  return true;

}

}