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

Commit 4473622e authored by Rahul Arya's avatar Rahul Arya
Browse files

Delete unused BLE scanner code 

This code is unreachable and duplicated by GD, so it can be removed.

Test: compilation
Bug: 284982932
Change-Id: Ibc260b4226f5b51ff749718f4f62e6c0564f371f
parent 1f95095d

system/main/shim/btm_api.cc

+0 −67
Original line number Diff line number Diff line
@@ -478,64 +478,6 @@ uint8_t bluetooth::shim::BTM_BleGetSupportedKeySize(const RawAddress& bd_addr) { 
  return 0;

}



/**

 * This function update(add,delete or clear) the adv local name filtering

 * condition.

 */

void bluetooth::shim::BTM_LE_PF_local_name(tBTM_BLE_SCAN_COND_OP action,

                                           tBTM_BLE_PF_FILT_INDEX filt_index,

                                           std::vector<uint8_t> name,

                                           tBTM_BLE_PF_CFG_CBACK cb) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_LE_PF_srvc_data(tBTM_BLE_SCAN_COND_OP action,

                                          tBTM_BLE_PF_FILT_INDEX filt_index) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_LE_PF_manu_data(

    tBTM_BLE_SCAN_COND_OP action, tBTM_BLE_PF_FILT_INDEX filt_index,

    uint16_t company_id, uint16_t company_id_mask, std::vector<uint8_t> data,

    std::vector<uint8_t> data_mask, tBTM_BLE_PF_CFG_CBACK cb) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_LE_PF_srvc_data_pattern(

    tBTM_BLE_SCAN_COND_OP action, tBTM_BLE_PF_FILT_INDEX filt_index,

    std::vector<uint8_t> data, std::vector<uint8_t> data_mask,

    tBTM_BLE_PF_CFG_CBACK cb) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_LE_PF_addr_filter(tBTM_BLE_SCAN_COND_OP action,

                                            tBTM_BLE_PF_FILT_INDEX filt_index,

                                            tBLE_BD_ADDR addr,

                                            tBTM_BLE_PF_CFG_CBACK cb) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_LE_PF_uuid_filter(tBTM_BLE_SCAN_COND_OP action,

                                            tBTM_BLE_PF_FILT_INDEX filt_index,

                                            tBTM_BLE_PF_COND_TYPE filter_type,

                                            const bluetooth::Uuid& uuid,

                                            tBTM_BLE_PF_LOGIC_TYPE cond_logic,

                                            const bluetooth::Uuid& uuid_mask,

                                            tBTM_BLE_PF_CFG_CBACK cb) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index,

                                    std::vector<ApcfCommand> commands,

                                    tBTM_BLE_PF_CFG_CBACK cb) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_LE_PF_clear(tBTM_BLE_PF_FILT_INDEX filt_index,

                                      tBTM_BLE_PF_CFG_CBACK cb) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_BleAdvFilterParamSetup(

    tBTM_BLE_SCAN_COND_OP action, tBTM_BLE_PF_FILT_INDEX filt_index,

    std::unique_ptr<btgatt_filt_param_setup_t> p_filt_params,
@@ -543,15 +485,6 @@ void bluetooth::shim::BTM_BleAdvFilterParamSetup( 
  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_BleUpdateAdvFilterPolicy(tBTM_BLE_AFP adv_policy) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



void bluetooth::shim::BTM_BleEnableDisableFilterFeature(

    uint8_t enable, tBTM_BLE_PF_STATUS_CBACK p_stat_cback) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

}



tBTM_STATUS bluetooth::shim::BTM_SecBond(const RawAddress& bd_addr,

                                         tBLE_ADDR_TYPE addr_type,

                                         tBT_TRANSPORT transport,

system/main/shim/btm_api.h

+0 −60
Original line number Diff line number Diff line
@@ -710,42 +710,6 @@ bool BTM_BleSecurityProcedureIsRunning(const RawAddress& bd_addr); 
 ******************************************************************************/

uint8_t BTM_BleGetSupportedKeySize(const RawAddress& bd_addr);



void BTM_LE_PF_local_name(tBTM_BLE_SCAN_COND_OP action,

                          tBTM_BLE_PF_FILT_INDEX filt_index,

                          std::vector<uint8_t> name, tBTM_BLE_PF_CFG_CBACK cb);



void BTM_LE_PF_srvc_data(tBTM_BLE_SCAN_COND_OP action,

                         tBTM_BLE_PF_FILT_INDEX filt_index);



void BTM_LE_PF_manu_data(tBTM_BLE_SCAN_COND_OP action,

                         tBTM_BLE_PF_FILT_INDEX filt_index, uint16_t company_id,

                         uint16_t company_id_mask, std::vector<uint8_t> data,

                         std::vector<uint8_t> data_mask,

                         tBTM_BLE_PF_CFG_CBACK cb);



void BTM_LE_PF_srvc_data_pattern(tBTM_BLE_SCAN_COND_OP action,

                                 tBTM_BLE_PF_FILT_INDEX filt_index,

                                 std::vector<uint8_t> data,

                                 std::vector<uint8_t> data_mask,

                                 tBTM_BLE_PF_CFG_CBACK cb);



void BTM_LE_PF_addr_filter(tBTM_BLE_SCAN_COND_OP action,

                           tBTM_BLE_PF_FILT_INDEX filt_index, tBLE_BD_ADDR addr,

                           tBTM_BLE_PF_CFG_CBACK cb);



void BTM_LE_PF_uuid_filter(tBTM_BLE_SCAN_COND_OP action,

                           tBTM_BLE_PF_FILT_INDEX filt_index,

                           tBTM_BLE_PF_COND_TYPE filter_type,

                           const bluetooth::Uuid& uuid,

                           tBTM_BLE_PF_LOGIC_TYPE cond_logic,

                           const bluetooth::Uuid& uuid_mask,

                           tBTM_BLE_PF_CFG_CBACK cb);



void BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index,

                   std::vector<ApcfCommand> commands, tBTM_BLE_PF_CFG_CBACK cb);

void BTM_LE_PF_clear(tBTM_BLE_PF_FILT_INDEX filt_index,

                     tBTM_BLE_PF_CFG_CBACK cb);



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

 *

 * Function         BTM_BleAdvFilterParamSetup
@@ -759,30 +723,6 @@ void BTM_BleAdvFilterParamSetup( 
    std::unique_ptr<btgatt_filt_param_setup_t> p_filt_params,

    tBTM_BLE_PF_PARAM_CB cb);



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

 *

 * Function         BTM_BleUpdateAdvFilterPolicy

 *

 * Description      This function update the filter policy of advertiser.

 *

 * Parameter        adv_policy: advertising filter policy

 *

 * Return           void

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

void BTM_BleUpdateAdvFilterPolicy(tBTM_BLE_AFP adv_policy);



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

 *

 * Function         BTM_BleEnableDisableFilterFeature

 *

 * Description      Enable or disable the APCF feature

 *

 * Parameters       enable - true - enables APCF, false - disables APCF

 *

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

void BTM_BleEnableDisableFilterFeature(uint8_t enable,

                                       tBTM_BLE_PF_STATUS_CBACK p_stat_cback);



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

 *

 * Function          BTM_BleMaxMultiAdvInstanceCount

system/stack/btm/btm_ble_adv_filter.cc

+0 −532

File changed.

Preview size limit exceeded, changes collapsed.

system/stack/include/btm_ble_api.h

+0 −20
Original line number Diff line number Diff line
@@ -588,26 +588,6 @@ void BTM_BleAdvFilterParamSetup( 
    std::unique_ptr<btgatt_filt_param_setup_t> p_filt_params,

    tBTM_BLE_PF_PARAM_CB cb);



/**

 * This functions are called to configure the adv data payload filter condition

 */

void BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index,

                   std::vector<ApcfCommand> commands, tBTM_BLE_PF_CFG_CBACK cb);

void BTM_LE_PF_clear(tBTM_BLE_PF_FILT_INDEX filt_index,

                     tBTM_BLE_PF_CFG_CBACK cb);



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

 *

 * Function         BTM_BleEnableDisableFilterFeature

 *

 * Description      Enable or disable the APCF feature

 *

 * Parameters       enable - true - enables APCF, false - disables APCF

 *

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

void BTM_BleEnableDisableFilterFeature(uint8_t enable,

                                       tBTM_BLE_PF_STATUS_CBACK p_stat_cback);



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

 *

 * Function         BTM_BleGetEnergyInfo

system/test/mock/mock_main_shim_btm_api.cc

+0 −53
Original line number Diff line number Diff line
@@ -253,10 +253,6 @@ void bluetooth::shim::BTM_BleAdvFilterParamSetup( 
    tBTM_BLE_PF_PARAM_CB cb) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_BleEnableDisableFilterFeature(

    uint8_t enable, tBTM_BLE_PF_STATUS_CBACK p_stat_cback) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_BleLoadLocalKeys(uint8_t key_type,

                                           tBTM_BLE_LOCAL_KEYS* p_key) {

  inc_func_call_count(__func__);
@@ -303,9 +299,6 @@ void bluetooth::shim::BTM_BleTransmitterTest(uint8_t tx_freq, 
                                             tBTM_CMPL_CB* p_cmd_cmpl_cback) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_BleUpdateAdvFilterPolicy(tBTM_BLE_AFP adv_policy) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_CancelInquiry(void) { inc_func_call_count(__func__); }

void bluetooth::shim::BTM_ConfirmReqReply(tBTM_STATUS res,

                                          const RawAddress& bd_addr) {
@@ -317,52 +310,6 @@ void bluetooth::shim::BTM_EnableInterlacedInquiryScan() { 
void bluetooth::shim::BTM_EnableInterlacedPageScan() {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_LE_PF_addr_filter(tBTM_BLE_SCAN_COND_OP action,

                                            tBTM_BLE_PF_FILT_INDEX filt_index,

                                            tBLE_BD_ADDR addr,

                                            tBTM_BLE_PF_CFG_CBACK cb) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_LE_PF_clear(tBTM_BLE_PF_FILT_INDEX filt_index,

                                      tBTM_BLE_PF_CFG_CBACK cb) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_LE_PF_local_name(tBTM_BLE_SCAN_COND_OP action,

                                           tBTM_BLE_PF_FILT_INDEX filt_index,

                                           std::vector<uint8_t> name,

                                           tBTM_BLE_PF_CFG_CBACK cb) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_LE_PF_manu_data(

    tBTM_BLE_SCAN_COND_OP action, tBTM_BLE_PF_FILT_INDEX filt_index,

    uint16_t company_id, uint16_t company_id_mask, std::vector<uint8_t> data,

    std::vector<uint8_t> data_mask, tBTM_BLE_PF_CFG_CBACK cb) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index,

                                    std::vector<ApcfCommand> commands,

                                    tBTM_BLE_PF_CFG_CBACK cb) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_LE_PF_srvc_data(tBTM_BLE_SCAN_COND_OP action,

                                          tBTM_BLE_PF_FILT_INDEX filt_index) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_LE_PF_srvc_data_pattern(

    tBTM_BLE_SCAN_COND_OP action, tBTM_BLE_PF_FILT_INDEX filt_index,

    std::vector<uint8_t> data, std::vector<uint8_t> data_mask,

    tBTM_BLE_PF_CFG_CBACK cb) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_LE_PF_uuid_filter(tBTM_BLE_SCAN_COND_OP action,

                                            tBTM_BLE_PF_FILT_INDEX filt_index,

                                            tBTM_BLE_PF_COND_TYPE filter_type,

                                            const bluetooth::Uuid& uuid,

                                            tBTM_BLE_PF_LOGIC_TYPE cond_logic,

                                            const bluetooth::Uuid& uuid_mask,

                                            tBTM_BLE_PF_CFG_CBACK cb) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::BTM_PINCodeReply(const RawAddress& bd_addr,

                                       tBTM_STATUS res, uint8_t pin_len,

                                       uint8_t* p_pin) {