summaryrefslogtreecommitdiff
path: root/system/bta/dm/bta_dm_main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'system/bta/dm/bta_dm_main.cc')
-rw-r--r--system/bta/dm/bta_dm_main.cc22
1 files changed, 21 insertions, 1 deletions
diff --git a/system/bta/dm/bta_dm_main.cc b/system/bta/dm/bta_dm_main.cc
index 5dd404b46f..523831b9da 100644
--- a/system/bta/dm/bta_dm_main.cc
+++ b/system/bta/dm/bta_dm_main.cc
@@ -82,6 +82,12 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) {
case BTA_DM_DISC_CLOSE_TOUT_EVT:
bta_dm_close_gatt_conn(message);
break;
+ case BTA_DM_API_QUEUE_SEARCH_EVT:
+ bta_dm_queue_search(message);
+ break;
+ case BTA_DM_API_QUEUE_DISCOVER_EVT:
+ bta_dm_queue_disc(message);
+ break;
}
break;
case BTA_DM_SEARCH_ACTIVE:
@@ -101,14 +107,20 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) {
case BTA_DM_DISC_CLOSE_TOUT_EVT:
bta_dm_close_gatt_conn(message);
break;
+ case BTA_DM_API_DISCOVER_EVT:
+ case BTA_DM_API_QUEUE_DISCOVER_EVT:
+ bta_dm_queue_disc(message);
+ break;
}
break;
case BTA_DM_SEARCH_CANCELLING:
switch (p_msg->event) {
case BTA_DM_API_SEARCH_EVT:
+ case BTA_DM_API_QUEUE_SEARCH_EVT:
bta_dm_queue_search(message);
break;
case BTA_DM_API_DISCOVER_EVT:
+ case BTA_DM_API_QUEUE_DISCOVER_EVT:
bta_dm_queue_disc(message);
break;
case BTA_DM_SDP_RESULT_EVT:
@@ -118,7 +130,7 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) {
bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);
bta_dm_free_sdp_db();
bta_dm_search_cancel_notify();
- bta_dm_search_cancel_cmpl();
+ bta_dm_execute_queued_request();
break;
}
break;
@@ -136,6 +148,14 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) {
case BTA_DM_DISCOVERY_RESULT_EVT:
bta_dm_disc_result(message);
break;
+ case BTA_DM_API_SEARCH_EVT:
+ case BTA_DM_API_QUEUE_SEARCH_EVT:
+ bta_dm_queue_search(message);
+ break;
+ case BTA_DM_API_DISCOVER_EVT:
+ case BTA_DM_API_QUEUE_DISCOVER_EVT:
+ bta_dm_queue_disc(message);
+ break;
}
break;
}