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

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

Remove unused pram from bta_dm_search_cancel 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5bf0c9e20ac774e0d6e1bc7e453ac53216d2ed9e
parent 916f0748

system/bta/dm/bta_dm_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ void bta_dm_search_start(tBTA_DM_MSG* p_data) { 
 * Returns          void

 *

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

void bta_dm_search_cancel(UNUSED_ATTR tBTA_DM_MSG* p_data) {

void bta_dm_search_cancel() {

  tBTA_DM_MSG* p_msg;



  if (BTM_IsInquiryActive()) {
@@ -989,7 +989,7 @@ static void bta_dm_di_disc_callback(uint16_t result) { 
static void bta_dm_disable_search_and_disc(void) {

  tBTA_DM_DI_DISC_CMPL di_disc;



  if (bta_dm_search_cb.state != BTA_DM_SEARCH_IDLE) bta_dm_search_cancel(NULL);

  if (bta_dm_search_cb.state != BTA_DM_SEARCH_IDLE) bta_dm_search_cancel();



  if (bta_dm_di_cb.p_di_db != NULL) {

    memset(&di_disc, 0, sizeof(tBTA_DM_DI_DISC_CMPL));

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ extern void bta_dm_disable_pm(void); 


extern uint8_t bta_dm_get_av_count(void);

extern void bta_dm_search_start(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel();

extern void bta_dm_discover(tBTA_DM_MSG* p_data);

extern void bta_dm_di_disc(tBTA_DM_MSG* p_data);

extern void bta_dm_inq_cmpl(uint8_t num);

system/bta/dm/bta_dm_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          bta_dm_search_cancel(message);

          bta_dm_search_cancel();

          break;

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_rmt_name(message);