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

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

legacy: Straighten out mixed bind parameter for le adv event am: de3ae37c... 

legacy: Straighten out mixed bind parameter for le adv event am: de3ae37c am: f0547fff am: 739266f0

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1853864

Change-Id: Ia41bf7cb2f80f19fc26dbfbe5b087c919dfdf00c
parents 87c85025 739266f0

system/btif/src/btif_dm.cc

+11 −16
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ static void btif_dm_ble_key_nc_req_evt(tBTA_DM_SP_KEY_NOTIF* p_notif_req); 
static void btif_dm_ble_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type);

static void btif_dm_ble_sc_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type);



static void bte_scan_filt_param_cfg_evt(tBTM_BLE_SCAN_COND_OP action_type,

                                        uint8_t avbl_space, uint8_t ref_value,

static void bte_scan_filt_param_cfg_evt(uint8_t avbl_space,

                                        tBTM_BLE_SCAN_COND_OP action_type,

                                        tBTM_STATUS btm_status);



static char* btif_get_default_local_name();
@@ -1276,11 +1276,9 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 
    } break;



    case BTA_DM_INQ_CMPL_EVT: {

      BTM_BleAdvFilterParamSetup(BTM_BLE_SCAN_COND_DELETE,

                                 static_cast<tBTM_BLE_PF_FILT_INDEX>(0),

                                 nullptr,

                                 base::Bind(&bte_scan_filt_param_cfg_evt,

                                            btm_status_value(BTM_SUCCESS)));

      BTM_BleAdvFilterParamSetup(

          BTM_BLE_SCAN_COND_DELETE, static_cast<tBTM_BLE_PF_FILT_INDEX>(0),

          nullptr, base::Bind(&bte_scan_filt_param_cfg_evt));

    } break;

    case BTA_DM_DISC_CMPL_EVT: {

      invoke_discovery_state_changed_cb(BT_DISCOVERY_STOPPED);
@@ -1299,8 +1297,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 
        btgatt_filt_param_setup_t adv_filt_param;

        memset(&adv_filt_param, 0, sizeof(btgatt_filt_param_setup_t));

        BTM_BleAdvFilterParamSetup(BTM_BLE_SCAN_COND_DELETE, 0, nullptr,

                                   base::Bind(&bte_scan_filt_param_cfg_evt,

                                              btm_status_value(BTM_SUCCESS)));

                                   base::Bind(&bte_scan_filt_param_cfg_evt));

        invoke_discovery_state_changed_cb(BT_DISCOVERY_STOPPED);

      }

    } break;
@@ -1815,8 +1812,7 @@ static void bta_energy_info_cb(tBTM_BLE_TX_TIME_MS tx_time, 
}



/* Scan filter param config event */

static void bte_scan_filt_param_cfg_evt(uint8_t ref_value, uint8_t avbl_space,

                                        uint8_t action_type,

static void bte_scan_filt_param_cfg_evt(uint8_t avbl_space, uint8_t action_type,

                                        tBTM_STATUS btm_status) {

  /* This event occurs on calling BTA_DmBleCfgFilterCondition internally,

  ** and that is why there is no HAL callback
@@ -1851,9 +1847,9 @@ void btif_dm_start_discovery(void) { 
  }



  /* Cleanup anything remaining on index 0 */

  BTM_BleAdvFilterParamSetup(

      BTM_BLE_SCAN_COND_DELETE, static_cast<tBTM_BLE_PF_FILT_INDEX>(0), nullptr,

      base::Bind(&bte_scan_filt_param_cfg_evt, btm_status_value(BTM_SUCCESS)));

  BTM_BleAdvFilterParamSetup(BTM_BLE_SCAN_COND_DELETE,

                             static_cast<tBTM_BLE_PF_FILT_INDEX>(0), nullptr,

                             base::Bind(&bte_scan_filt_param_cfg_evt));



  auto adv_filt_param = std::make_unique<btgatt_filt_param_setup_t>();

  /* Add an allow-all filter on index 0*/
@@ -1865,8 +1861,7 @@ void btif_dm_start_discovery(void) { 
  adv_filt_param->rssi_high_thres = LOWEST_RSSI_VALUE;

  BTM_BleAdvFilterParamSetup(

      BTM_BLE_SCAN_COND_ADD, static_cast<tBTM_BLE_PF_FILT_INDEX>(0),

      std::move(adv_filt_param),

      base::Bind(&bte_scan_filt_param_cfg_evt, btm_status_value(BTM_SUCCESS)));

      std::move(adv_filt_param), base::Bind(&bte_scan_filt_param_cfg_evt));



  /* Will be enabled to true once inquiry busy level has been received */

  btif_dm_inquiry_in_progress = false;