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

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

don't use the redefinition - BTM_FILTER_COND_DEVICE_CLASS 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2ca84a80781bb0ad9ecd53cfed5b68991ee7130f
parent 61688d21

system/stack/btm/btm_inq.cc

+2 −2
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
      p_inq->state = BTM_INQ_SET_FILT_STATE;

      break;



    case BTM_FILTER_COND_DEVICE_CLASS:

    case HCI_FILTER_COND_DEVICE_CLASS:

    case BTM_FILTER_COND_BD_ADDR:

      /* The filter is not being used so simply clear it;

          the inquiry can start after this operation */
@@ -1242,7 +1242,7 @@ static tBTM_STATUS btm_set_inq_event_filter(uint8_t filter_cond_type, 


  /* Load the correct filter condition to pass to the lower layer */

  switch (filter_cond_type) {

    case BTM_FILTER_COND_DEVICE_CLASS:

    case HCI_FILTER_COND_DEVICE_CLASS:

      /* copy the device class and device class fields into contiguous memory to

       * send to HCI */

      memcpy(condition_buf, p_filt_cond->cod_cond.dev_class, DEV_CLASS_LEN);

system/stack/include/btm_api_types.h

+0 −2
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ typedef void(tBTM_VSC_CMPL_CB)(tBTM_VSC_CMPL* p1); 
/* Inquiry Filter Condition types (see tBTM_INQ_PARMS) */

/* Inquiry Filtering is turned off */

#define BTM_CLR_INQUIRY_FILTER 0

/* Filter on device class */

#define BTM_FILTER_COND_DEVICE_CLASS HCI_FILTER_COND_DEVICE_CLASS

/* Filter on device addr */

#define BTM_FILTER_COND_BD_ADDR HCI_FILTER_COND_BD_ADDR