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

Commit b5063e34 authored by Paul Wang's avatar Paul Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix L2CAP PTS issue" into main am: 549850b3 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2472085



Change-Id: I92b0388fc8336917833536c98f32e9750d29ea86
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96eb356a 549850b3

system/stack/l2cap/l2c_csm.cc

+7 −3
Original line number Original line Diff line number Diff line
@@ -100,9 +100,13 @@ static void l2c_csm_indicate_connection_open(tL2C_CCB* p_ccb) { 
  if (p_ccb->connection_initiator == L2CAP_INITIATOR_LOCAL) {

  if (p_ccb->connection_initiator == L2CAP_INITIATOR_LOCAL) {

    (*p_ccb->p_rcb->api.pL2CA_ConnectCfm_Cb)(p_ccb->local_cid, L2CAP_CONN_OK);

    (*p_ccb->p_rcb->api.pL2CA_ConnectCfm_Cb)(p_ccb->local_cid, L2CAP_CONN_OK);

  } else {

  } else {

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

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

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

          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);

    } else {

      LOG_WARN("pL2CA_ConnectInd_Cb is null");

    }

  }

  }

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

  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)(