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

Commit bcd81fa9 authored by Zach Johnson's avatar Zach Johnson
Browse files

pending_filt_complete_event is always zero 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5f54b858c761f11b06c57e2bc36ed62104cd31b5
parent 0db057e0

system/stack/btm/btm_inq.cc

+0 −7
Original line number Diff line number Diff line
@@ -907,7 +907,6 @@ void btm_inq_db_reset(void) { 
  }



  p_inq->state = BTM_INQ_INACTIVE_STATE;

  p_inq->pending_filt_complete_event = 0;

  p_inq->p_inq_results_cb = NULL;

  btm_clr_inq_db(NULL); /* Clear out all the entries in the database */

  btm_clr_inq_result_flt();
@@ -1170,12 +1169,6 @@ static void btm_set_inq_event_filter() { 
  BTM_TRACE_DEBUG("btm_event_filter_complete: inq_active:0x%x state:%d",

                  btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);

#endif

  /* If the filter complete event is from an old or cancelled request, ignore it

   */

  if (p_inq->pending_filt_complete_event) {

    p_inq->pending_filt_complete_event--;

    return;

  }



  p_inq->state = BTM_INQ_ACTIVE_STATE;

  btm_initiate_inquiry(p_inq);

system/stack/btm/security_device_record.h

+0 −3
Original line number Diff line number Diff line
@@ -200,9 +200,6 @@ typedef struct { 


  uint16_t per_min_delay; /* Current periodic minimum delay */

  uint16_t per_max_delay; /* Current periodic maximum delay */

  uint8_t pending_filt_complete_event; /* to take care of

                                          btm_event_filter_complete

                                          corresponding to */

  /* inquiry that has been cancelled*/

  uint8_t inqfilt_type; /* Contains the inquiry filter type (BD ADDR, COD, or

                           Clear) */