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

Commit 16ecc1ec authored by Arman Uguray's avatar Arman Uguray Committed by Android Git Automerger
Browse files

am 133fc588: Properly disconnect GATT connection during noisy scans 

* commit '133fc588':
  Properly disconnect GATT connection during noisy scans
parents 5586e8cb 133fc588

system/bta/gatt/bta_gattc_act.c

+13 −1
Original line number Diff line number Diff line
@@ -858,11 +858,23 @@ void bta_gattc_reset_discover_st(tBTA_GATTC_SERV *p_srcb, tBTA_GATT_STATUS statu 
*******************************************************************************/

void bta_gattc_disc_close(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)

{

    APPL_TRACE_DEBUG("Discovery cancel conn_id=%d",p_clcb->bta_conn_id);

    APPL_TRACE_DEBUG("%s: Discovery cancel conn_id=%d", __func__,

                     p_clcb->bta_conn_id);



    if (p_clcb->disc_active)

        bta_gattc_reset_discover_st(p_clcb->p_srcb, BTA_GATT_ERROR);

    else

        p_clcb->state = BTA_GATTC_CONN_ST;



    // This function only gets called as the result of a BTA_GATTC_API_CLOSE_EVT

    // while in the BTA_GATTC_DISCOVER_ST state. Once the state changes, the

    // connection itself still needs to be closed to resolve the original event.

    if (p_clcb->state == BTA_GATTC_CONN_ST)

    {

        APPL_TRACE_DEBUG("State is back to BTA_GATTC_CONN_ST. "

                         "Trigger connection close");

        bta_gattc_close(p_clcb, p_data);

    }

}

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

**

system/bta/sys/bta_sys_main.c

+6 −1
Original line number Diff line number Diff line
@@ -597,6 +597,11 @@ BOOLEAN bta_sys_is_register(UINT8 id) 
*******************************************************************************/

void bta_sys_sendmsg(void *p_msg)

{

    // There is a race condition that occurs if the stack is shut down while

    // there is a procedure in progress that can schedule a task via this

    // message queue. This causes |btu_bta_msg_queue| to get cleaned up before

    // it gets used here; hence we check for NULL before using it.

    if (btu_bta_msg_queue)

        fixed_queue_enqueue(btu_bta_msg_queue, p_msg);

}