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

Commit c1d96b63 authored by Chaojing Sun's avatar Chaojing Sun Committed by Prerepa Viswanadham
Browse files

Bluetooth fails to turn off with keyboard and headset connected 

When HOGP keyboard is connecting and BT off is requested, if there
is any HOGP data that was received during this state, it causes the
following side-effects:
- LE data was not thrown away in disconnecting state, instead it is
now being used as indication of link establishement
-The above triggers the link open callback for fix channel and
causes the BT off failure.

Check L2CAP link state and always discard the fixed channel data
received in disconnecting state solves the problem.

Bug: 17793437
Change-Id: I633d5e6346e952daa2abd642effad2f260954fdf
parent eab40514

system/stack/l2cap/l2c_main.c

100644 → 100755
+4 −1
Original line number Diff line number Diff line
@@ -267,7 +267,10 @@ void l2c_rcv_acl_data (BT_HDR *p_msg) 
             (l2cb.fixed_reg[rcv_cid - L2CAP_FIRST_FIXED_CHNL].pL2CA_FixedData_Cb != NULL) )

    {

        /* If no CCB for this channel, allocate one */

        if (p_lcb && l2cu_initialize_fixed_ccb (p_lcb, rcv_cid,

        if (p_lcb &&

            /* discard fixed channel data when link is disconnecting */

            (p_lcb->link_state != LST_DISCONNECTING) &&

            l2cu_initialize_fixed_ccb (p_lcb, rcv_cid,

                &l2cb.fixed_reg[rcv_cid - L2CAP_FIRST_FIXED_CHNL].fixed_chnl_opts))

        {

#if(defined BLE_INCLUDED && (BLE_INCLUDED == TRUE))