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

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

Flatten bta_dm_search_cancel_transac_cmpl 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1b2dcf46c0e4b7b983d2bd2d7765ce08a5aaf27e
parent bc31e3f6

system/bta/dm/bta_dm_act.cc

+0 −15
Original line number Diff line number Diff line
@@ -1562,21 +1562,6 @@ void bta_dm_search_cancel_cmpl(UNUSED_ATTR tBTA_DM_MSG* p_data) { 
  }

}



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

 *

 * Function         bta_dm_search_cancel_transac_cmpl

 *

 * Description      Current Service Discovery or remote name procedure is

 *                  completed after search cancellation

 *

 * Returns          void

 *

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

void bta_dm_search_cancel_transac_cmpl(UNUSED_ATTR tBTA_DM_MSG* p_data) {

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

  bta_dm_search_cancel_notify(NULL);

}



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

 *

 * Function         bta_dm_search_cancel_notify

system/bta/dm/bta_dm_int.h

+0 −1
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ 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_transac_cmpl(tBTA_DM_MSG* p_data);

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

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
        case BTA_DM_SEARCH_CMPL_EVT:

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_search_cancel_transac_cmpl(message);

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

          bta_dm_search_cancel_notify(NULL);

          bta_dm_search_cancel_cmpl(message);

          break;

      }