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

Commit 3af4ffd3 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove unused arg from bta_dm_search_cancel_cmpl 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1133e4c378625578aea5cbfec2385b9f770afa39
parent 529ef538

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ void bta_dm_search_clear_queue(UNUSED_ATTR tBTA_DM_MSG* p_data) { 
 * Returns          void

 *

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

void bta_dm_search_cancel_cmpl(UNUSED_ATTR tBTA_DM_MSG* p_data) {

void bta_dm_search_cancel_cmpl() {

  if (bta_dm_search_cb.p_search_queue) {

    bta_sys_sendmsg(bta_dm_search_cb.p_search_queue);

    bta_dm_search_cb.p_search_queue = NULL;

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ extern void bta_dm_discovery_cmpl(tBTA_DM_MSG* p_data); 
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_cmpl();

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(

system/bta/dm/bta_dm_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
          break;

        case BTA_DM_INQUIRY_CMPL_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_search_cancel_cmpl(message);

          bta_dm_search_cancel_cmpl();

          break;

        case BTA_DM_SDP_RESULT_EVT:

        case BTA_DM_REMT_NAME_EVT:
@@ -139,7 +139,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
          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();

          bta_dm_search_cancel_cmpl(message);

          bta_dm_search_cancel_cmpl();

          break;

      }

      break;