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

Commit 4b784d7e authored by Chris Manton's avatar Chris Manton
Browse files

Invert priority queue order disc > search 

Bug: 272513098
Test: Manual testing
Change-Id: I87b27a93cc8409aef431b3150c53afb308188878
parent 09516eb6

system/bta/dm/bta_dm_act.cc

+6 −8
Original line number Diff line number Diff line
@@ -1657,17 +1657,15 @@ void bta_dm_queue_disc(tBTA_DM_MSG* p_data) { 
 *

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

void bta_dm_execute_queued_request() {

  if (bta_dm_search_cb.p_pending_search) {

    LOG_INFO("%s Start pending search", __func__);

    bta_sys_sendmsg(bta_dm_search_cb.p_pending_search);

    bta_dm_search_cb.p_pending_search = NULL;

  } else {

  tBTA_DM_MSG* p_pending_discovery = (tBTA_DM_MSG*)fixed_queue_try_dequeue(

      bta_dm_search_cb.pending_discovery_queue);

  if (p_pending_discovery) {

    LOG_INFO("%s Start pending discovery", __func__);

    bta_sys_sendmsg(p_pending_discovery);

    }

  } else if (bta_dm_search_cb.p_pending_search) {

    LOG_INFO("%s Start pending search", __func__);

    bta_sys_sendmsg(bta_dm_search_cb.p_pending_search);

    bta_dm_search_cb.p_pending_search = NULL;

  }

}