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

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

Don't use redefinition - BTM_FILTER_COND_BD_ADDR 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I14148e2bd2dc86c89ddc761e5990f1a4c3225ca9
parent 15357041

system/stack/btm/btm_ble_gap.cc

+1 −1
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ uint8_t btm_ble_is_discoverable(const RawAddress& bda, 
    rt |= BTM_BLE_OBS_RESULT;



  /* does not match filter condition */

  if (p_cond->filter_cond_type == BTM_FILTER_COND_BD_ADDR &&

  if (p_cond->filter_cond_type == HCI_FILTER_COND_BD_ADDR &&

      bda != p_cond->filter_cond.bdaddr_cond) {

    BTM_TRACE_DEBUG("BD ADDR does not meet filter condition");

    return rt;

system/stack/btm/btm_inq.cc

+2 −2
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
      break;



    case HCI_FILTER_COND_DEVICE_CLASS:

    case BTM_FILTER_COND_BD_ADDR:

    case HCI_FILTER_COND_BD_ADDR:

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

          the inquiry can start after this operation */

      p_inq->state = BTM_INQ_CLR_FILT_STATE;
@@ -1252,7 +1252,7 @@ static tBTM_STATUS btm_set_inq_event_filter(uint8_t filter_cond_type, 
      /* condition length should already be set as the default */

      break;



    case BTM_FILTER_COND_BD_ADDR:

    case HCI_FILTER_COND_BD_ADDR:

      p_cond = (uint8_t*)&p_filt_cond->bdaddr_cond;



      /* condition length should already be set as the default */

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 addr */

#define BTM_FILTER_COND_BD_ADDR HCI_FILTER_COND_BD_ADDR



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

 * minor device class field