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

Commit 42a73fdc authored by Zach Johnson's avatar Zach Johnson
Browse files

bta_dm_search_cmpl always transitions to idle 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I79bbb8243e207ed37efb92d308d68b53ad50963b
parent 96f1177b

system/bta/dm/bta_dm_act.cc

+1 −2
Original line number Diff line number Diff line
@@ -971,8 +971,6 @@ void bta_dm_inq_cmpl(uint8_t num) { 
        bta_dm_search_cb.p_btm_inq_info->results.remote_bd_addr);

  } else {

    bta_dm_search_cb.services = 0;



    bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

    bta_dm_search_cmpl();

  }

}
@@ -1234,6 +1232,7 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
 *

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

void bta_dm_search_cmpl() {

  bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

  bta_dm_search_cb.p_search_cback(BTA_DM_DISC_CMPL_EVT, NULL);

}

system/bta/dm/bta_dm_main.cc

+0 −2
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
          bta_dm_sdp_result(message);

          break;

        case BTA_DM_SEARCH_CMPL_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_search_cmpl();

          break;

        case BTA_DM_DISCOVERY_RESULT_EVT:
@@ -131,7 +130,6 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
          bta_dm_sdp_result(message);

          break;

        case BTA_DM_SEARCH_CMPL_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_search_cmpl();

          break;

        case BTA_DM_DISCOVERY_RESULT_EVT: