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

Commit 8afa256e authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

L2cap CoC callback use Confirm not Ind on server am: 00b79b53 am: 72237670 am: e8968ea1 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1442318

Change-Id: I928957d2f306cda19a00591f2272c3166bffd232
parents 5b48df9a e8968ea1

system/stack/l2cap/l2c_csm.cc

+2 −4
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ static void l2c_csm_indicate_connection_open(tL2C_CCB* p_ccb) { 
        p_ccb->p_lcb->remote_bd_addr, p_ccb->local_cid, p_ccb->p_rcb->psm,

        p_ccb->p_lcb->remote_bd_addr, p_ccb->local_cid, p_ccb->p_rcb->psm,

        p_ccb->remote_id);

        p_ccb->remote_id);

  }

  }

  if (p_ccb->chnl_state == CST_OPEN) {

  if (p_ccb->chnl_state == CST_OPEN && !p_ccb->p_lcb->is_transport_ble()) {

    (*p_ccb->p_rcb->api.pL2CA_ConfigCfm_Cb)(

    (*p_ccb->p_rcb->api.pL2CA_ConfigCfm_Cb)(

        p_ccb->local_cid, p_ccb->connection_initiator, &p_ccb->peer_cfg);

        p_ccb->local_cid, p_ccb->connection_initiator, &p_ccb->peer_cfg);

  }

  }
@@ -563,9 +563,7 @@ static void l2c_csm_w4_l2cap_connect_rsp(tL2C_CCB* p_ccb, uint16_t event, 
        /* Connection is completed */

        /* Connection is completed */

        alarm_cancel(p_ccb->l2c_ccb_timer);

        alarm_cancel(p_ccb->l2c_ccb_timer);

        p_ccb->chnl_state = CST_OPEN;

        p_ccb->chnl_state = CST_OPEN;

        (*p_ccb->p_rcb->api.pL2CA_ConnectInd_Cb)(

        l2c_csm_indicate_connection_open(p_ccb);

            p_ccb->p_lcb->remote_bd_addr, p_ccb->local_cid, p_ccb->p_rcb->psm,

            p_ccb->remote_id);

      } else {

      } else {

        p_ccb->chnl_state = CST_CONFIG;

        p_ccb->chnl_state = CST_CONFIG;

        alarm_set_on_mloop(p_ccb->l2c_ccb_timer, L2CAP_CHNL_CFG_TIMEOUT_MS,

        alarm_set_on_mloop(p_ccb->l2c_ccb_timer, L2CAP_CHNL_CFG_TIMEOUT_MS,