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

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

Merge "Move btm_clear_all_pending_le_entry to proper spot" am: f05760e7 am: 16dd74e3 

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



Change-Id: I267180e33a16e853e8e87177bc418c8a4f850900
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6db5ac3 16dd74e3

system/stack/btm/btm_ble_gap.cc

+0 −25
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ extern bool btm_identity_addr_to_random_pseudo(RawAddress* bd_addr, 
                                               bool refresh);

extern void btm_ble_batchscan_init(void);

extern void btm_ble_adv_filter_init(void);

extern void btm_clear_all_pending_le_entry(void);

extern const tBLE_BD_ADDR convert_to_address_with_type(

    const RawAddress& bd_addr, const tBTM_SEC_DEV_REC* p_dev_rec);
@@ -2530,30 +2529,6 @@ void btm_ble_update_inq_result(tINQ_DB_ENT* p_i, uint8_t addr_type, 
  }

}



/*******************************************************************************

 *

 * Function         btm_clear_all_pending_le_entry

 *

 * Description      This function is called to clear all LE pending entry in

 *                  inquiry database.

 *

 * Returns          void

 *

 ******************************************************************************/

void btm_clear_all_pending_le_entry(void) {

  uint16_t xx;

  tINQ_DB_ENT* p_ent = btm_cb.btm_inq_vars.inq_db;



  for (xx = 0; xx < BTM_INQ_DB_SIZE; xx++, p_ent++) {

    /* mark all pending LE entry as unused if an LE only device has scan

     * response outstanding */

    if ((p_ent->in_use) &&

        (p_ent->inq_info.results.device_type == BT_DEVICE_TYPE_BLE) &&

        !p_ent->scan_rsp)

      p_ent->in_use = false;

  }

}



void btm_ble_process_adv_addr(RawAddress& bda, tBLE_ADDR_TYPE* addr_type) {

  /* map address to security record */

  bool match = btm_identity_addr_to_random_pseudo(&bda, addr_type, false);

system/stack/btm/btm_ble_int.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ extern void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int, 
                                         uint16_t scan_win,

                                         tBLE_ADDR_TYPE addr_type_own,

                                         uint8_t scan_filter_policy);

extern void btm_clear_all_pending_le_entry(void);



extern void btm_ble_init(void);

extern void btm_ble_free();

system/stack/btm/btm_inq.cc

+24 −0
Original line number Diff line number Diff line
@@ -847,6 +847,30 @@ tBTM_STATUS BTM_ClearInqDb(const RawAddress* p_bda) { 
  return (BTM_SUCCESS);

}



/*******************************************************************************

 *

 * Function         btm_clear_all_pending_le_entry

 *

 * Description      This function is called to clear all LE pending entry in

 *                  inquiry database.

 *

 * Returns          void

 *

 ******************************************************************************/

void btm_clear_all_pending_le_entry(void) {

  uint16_t xx;

  tINQ_DB_ENT* p_ent = btm_cb.btm_inq_vars.inq_db;



  for (xx = 0; xx < BTM_INQ_DB_SIZE; xx++, p_ent++) {

    /* mark all pending LE entry as unused if an LE only device has scan

     * response outstanding */

    if ((p_ent->in_use) &&

        (p_ent->inq_info.results.device_type == BT_DEVICE_TYPE_BLE) &&

        !p_ent->scan_rsp)

      p_ent->in_use = false;

  }

}



/*******************************************************************************

 *******************************************************************************

 *                                                                            **

system/test/mock/mock_stack_btm_ble_gap.cc

+0 −1
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ void btm_ble_update_mode_operation(uint8_t link_role, const RawAddress* bd_addr, 
void btm_ble_write_adv_enable_complete(uint8_t* p, uint16_t evt_len) {

  inc_func_call_count(__func__);

}

void btm_clear_all_pending_le_entry(void) { inc_func_call_count(__func__); }

void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int,

                                  uint16_t scan_win,

                                  tBLE_ADDR_TYPE addr_type_own,

system/test/mock/mock_stack_btm_inq.cc

+4 −0
Original line number Diff line number Diff line
@@ -176,3 +176,7 @@ bool BTM_IsRemoteNameKnown(const RawAddress& bd_addr, tBT_TRANSPORT transport) { 
  inc_func_call_count(__func__);

  return false;

}

void btm_clear_all_pending_le_entry(void) { inc_func_call_count(__func__); }



// Mocked functions complete

// END mockcify generation