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

Commit 7551ddb3 authored by Vic Huang's avatar Vic Huang Committed by android-build-merger
Browse files

Merge "Dont disconnect if connection complete event with an ACL connection exists" 

am: 0cd968b5

Change-Id: Ie2413bc4b3d7eef27b54e57571e0b018b41177cd
parents 605173a7 0cd968b5

system/stack/l2cap/l2c_link.cc

+6 −1
Original line number Diff line number Diff line
@@ -170,7 +170,12 @@ bool l2c_link_hci_conn_comp(uint8_t status, uint16_t handle, 
    p_lcb->link_state = LST_CONNECTING;

  }



  if (p_lcb->link_state != LST_CONNECTING) {

  if ((p_lcb->link_state == LST_CONNECTED) &&

      (status == HCI_ERR_CONNECTION_EXISTS)) {

    L2CAP_TRACE_WARNING("%s: An ACL connection already exists. Handle:%d",

                        __func__, handle);

    return (true);

  } else if (p_lcb->link_state != LST_CONNECTING) {

    L2CAP_TRACE_ERROR("L2CAP got conn_comp in bad state: %d  status: 0x%d",

                      p_lcb->link_state, status);