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

Commit b0711267 authored by Matthew Xie's avatar Matthew Xie
Browse files

bta_dm_search_cancel sends dm_search state machine complete events 

bta_dm_search_cancel moves dm_search state from active search to
search_canceling state. The function is also responsible of moving
the state out of canceling state.
Bug: 19017339

Change-Id: Idea0cb0e2987892a5fc0f66db8eed19f57c68b89
parent 7c786133

system/bta/dm/bta_dm_act.c

+16 −1
Original line number Diff line number Diff line
@@ -1273,14 +1273,29 @@ void bta_dm_search_cancel (tBTA_DM_MSG *p_data) 
            p_msg->hdr.event = BTA_DM_SEARCH_CMPL_EVT;

            p_msg->hdr.layer_specific = BTA_DM_API_DISCOVER_EVT;

            bta_sys_sendmsg(p_msg);



        }

    }

    /* If no Service Search going on then issue cancel remote name in case it is active */

    else if (!bta_dm_search_cb.name_discover_done)

    {

        BTM_CancelRemoteDeviceName();



        if ((p_msg = (tBTA_DM_MSG *) GKI_getbuf(sizeof(tBTA_DM_MSG))) != NULL)

        {

            p_msg->hdr.event = BTA_DM_REMT_NAME_EVT;

            p_msg->hdr.layer_specific = BTA_DM_API_DISCOVER_EVT;

            bta_sys_sendmsg(p_msg);

        }

    }

    else {

        if ((p_msg = (tBTA_DM_MSG *) GKI_getbuf(sizeof(tBTA_DM_MSG))) != NULL)

        {

            p_msg->hdr.event = BTA_DM_INQUIRY_CMPL_EVT;

            p_msg->hdr.layer_specific = BTA_DM_API_DISCOVER_EVT;

            bta_sys_sendmsg(p_msg);

        }

    }



#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE

    if (bta_dm_search_cb.gatt_disc_active)

    {