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

Commit 9db69170 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "Only add btm_ble_enq_resolving_list_pending when privacy not enabled"... 

Merge "Only add btm_ble_enq_resolving_list_pending when privacy not enabled" am: 4f59bb54 am: bd1bbc71 am: cdc47e5a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2115255



Change-Id: I4a357c9749b62977b1d3d94dbe4cda59c17ae0d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c89b118 cdc47e5a

system/stack/btm/btm_ble_privacy.cc

+5 −7
Original line number 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_BLE_META_REMOVE_IRK_LEN, param,

                              btm_ble_resolving_list_vsc_op_cmpl);

  }



    btm_ble_enq_resolving_list_pending(p_dev_rec->bd_addr,

                                       BTM_BLE_META_REMOVE_IRK_ENTRY);

  }

  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,

                              param, btm_ble_resolving_list_vsc_op_cmpl);

  }



    btm_ble_enq_resolving_list_pending(p_dev_rec->bd_addr,

                                       BTM_BLE_META_READ_IRK_ENTRY);



  }

  return true;

}