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

Commit 529ef538 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove unused arg from bta_dm_search_cancel_notify 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I24e59faf767ca6371ddc65c69a73dfc00a5c1d3a
parent 3dce94b1

system/bta/dm/bta_dm_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ void bta_dm_search_cancel(UNUSED_ATTR tBTA_DM_MSG* p_data) { 


  if (BTM_IsInquiryActive()) {

    if (BTM_CancelInquiry() == BTM_SUCCESS) {

      bta_dm_search_cancel_notify(NULL);

      bta_dm_search_cancel_notify();

      p_msg = (tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_MSG));

      p_msg->hdr.event = BTA_DM_SEARCH_CMPL_EVT;

      p_msg->hdr.layer_specific = BTA_DM_API_DISCOVER_EVT;
@@ -1571,7 +1571,7 @@ void bta_dm_search_cancel_cmpl(UNUSED_ATTR tBTA_DM_MSG* p_data) { 
 * Returns          void

 *

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

void bta_dm_search_cancel_notify(UNUSED_ATTR tBTA_DM_MSG* p_data) {

void bta_dm_search_cancel_notify() {

  if (bta_dm_search_cb.p_search_cback) {

    bta_dm_search_cb.p_search_cback(BTA_DM_SEARCH_CANCEL_CMPL_EVT, NULL);

  }
@@ -1948,7 +1948,7 @@ static void bta_dm_inq_cmpl_cb(void* p_result) { 
    p_msg->inq_cmpl.num = ((tBTM_INQUIRY_CMPL*)p_result)->num_resp;

  } else {

    bta_dm_search_cb.cancel_pending = false;

    bta_dm_search_cancel_notify(NULL);

    bta_dm_search_cancel_notify();

    p_msg->hdr.event = BTA_DM_SEARCH_CMPL_EVT;

    p_msg->hdr.layer_specific = BTA_DM_API_DISCOVER_EVT;

  }

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ extern void bta_dm_queue_search(tBTA_DM_MSG* p_data); 
extern void bta_dm_queue_disc(tBTA_DM_MSG* p_data);

extern void bta_dm_search_clear_queue(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel_cmpl(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel_notify(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel_notify();

extern void bta_dm_disc_rmt_name(tBTA_DM_MSG* p_data);

extern tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device(

    const RawAddress& peer_addr);

system/bta/dm/bta_dm_main.cc

+4 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
          bta_dm_search_start(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_cancel_notify(message);

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_search_set_state(BTA_DM_DISCOVER_ACTIVE);
@@ -123,7 +123,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue(message);

          bta_dm_search_cancel_notify(message);

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);
@@ -138,7 +138,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          osi_free_and_reset((void**)&bta_dm_search_cb.p_sdp_db);

          bta_dm_search_cancel_notify(NULL);

          bta_dm_search_cancel_notify();

          bta_dm_search_cancel_cmpl(message);

          break;

      }
@@ -147,7 +147,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_notify(message);

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_rmt_name(message);