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

Commit 3e96881c authored by Zach Johnson's avatar Zach Johnson
Browse files

report_dup is always true 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I228ee25fab7cb06ec3198947e4715073c96876f1
parent 8298e603

system/main/shim/btm_api.cc

+1 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void btm_api_process_inquiry_result_with_rssi(RawAddress raw_address, 


  bool update = false;

  if (btm_inq_find_bdaddr(raw_address)) {

    if (btm_cb.btm_inq_vars.inqparms.report_dup && p_i != nullptr &&

    if (p_i != nullptr &&

        (rssi > p_i->inq_info.results.rssi || p_i->inq_info.results.rssi == 0 ||

         has_classic_device(p_i->inq_info.results.device_type))) {

      update = true;
@@ -291,7 +291,6 @@ tBTM_STATUS bluetooth::shim::BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
  inqparms.duration = BTIF_DM_DEFAULT_INQ_MAX_DURATION;



  inqparms.max_resps = BTIF_DM_DEFAULT_INQ_MAX_RESULTS;

  inqparms.report_dup = true;



  std::lock_guard<std::mutex> lock(btm_cb_mutex_);

system/stack/btm/btm_inq.cc

+1 −2
Original line number Diff line number Diff line
@@ -624,7 +624,6 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
  p_inq->inqparms.duration = BTIF_DM_DEFAULT_INQ_MAX_DURATION;



  p_inq->inqparms.max_resps = BTIF_DM_DEFAULT_INQ_MAX_RESULTS;

  p_inq->inqparms.report_dup = true;



  /* Initialize the inquiry variables */

  p_inq->state = BTM_INQ_ACTIVE_STATE;
@@ -1311,7 +1310,7 @@ void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len, 
      i_rssi = (int8_t)rssi;



      /* If this new RSSI is higher than the last one */

      if (p_inq->inqparms.report_dup && (rssi != 0) && p_i &&

      if ((rssi != 0) && p_i &&

          (i_rssi > p_i->inq_info.results.rssi ||

           p_i->inq_info.results.rssi == 0

           /* BR/EDR inquiry information update */

system/stack/include/btm_api_types.h

+0 −2
Original line number Diff line number Diff line
@@ -417,8 +417,6 @@ typedef struct /* contains the parameters passed to the inquiry functions */ 
  uint8_t mode;      /* general or limited */

  uint8_t duration;  /* duration of the inquiry (1.28 sec increments) */

  uint8_t max_resps; /* maximum number of responses to return */

  bool report_dup; /* report duplicated inquiry response with higher RSSI value

                      */

  tBTM_INQ_FILT_COND filter_cond; /* filter value based on filter cond type */

} tBTM_INQ_PARMS;