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

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

Flatten BTA_DM_API_SEARCH_CANCEL_EVT 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4ddc6e3574e822d6ae93401ac995d96ef0b6ade7
parent 91f52b24

system/bta/dm/bta_dm_api.cc

+17 −4
Original line number Diff line number Diff line
@@ -109,10 +109,23 @@ void BTA_DmSearch(tBTA_DM_INQ* p_dm_inq, tBTA_SERVICE_MASK services, 
 *

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

void BTA_DmSearchCancel(void) {

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



  p_msg->event = BTA_DM_API_SEARCH_CANCEL_EVT;

  bta_sys_sendmsg(p_msg);

  switch (bta_dm_search_get_state()) {

    case BTA_DM_SEARCH_IDLE:

      bta_dm_search_cancel_notify();

      break;

    case BTA_DM_SEARCH_ACTIVE:

      bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

      bta_dm_search_cancel();

      break;

    case BTA_DM_SEARCH_CANCELLING:

      bta_dm_search_clear_queue();

      bta_dm_search_cancel_notify();

      break;

    case BTA_DM_DISCOVER_ACTIVE:

      bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

      bta_dm_search_cancel_notify();

      break;

  }

}



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

system/bta/dm/bta_dm_int.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
enum {

  /* DM search API events */

  BTA_DM_API_SEARCH_EVT = BTA_SYS_EVT_START(BTA_ID_DM_SEARCH),

  BTA_DM_API_SEARCH_CANCEL_EVT,

  BTA_DM_API_DISCOVER_EVT,

  BTA_DM_INQUIRY_CMPL_EVT,

  BTA_DM_REMT_NAME_EVT,

system/bta/dm/bta_dm_main.cc

+0 −15
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
          bta_dm_search_set_state(BTA_DM_SEARCH_ACTIVE);

          bta_dm_search_start(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_search_set_state(BTA_DM_DISCOVER_ACTIVE);

          bta_dm_discover(message);
@@ -92,10 +89,6 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
      break;

    case BTA_DM_SEARCH_ACTIVE:

      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          bta_dm_search_cancel();

          break;

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_rmt_name(message);

          break;
@@ -119,10 +112,6 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
        case BTA_DM_API_SEARCH_EVT:

          bta_dm_queue_search(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;
@@ -139,10 +128,6 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
      break;

    case BTA_DM_DISCOVER_ACTIVE:

      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();

          break;

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_rmt_name(message);

          break;