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

Commit b85099a2 authored by Aritra Sen's avatar Aritra Sen Committed by Automerger Merge Worker
Browse files

Merge "L2CAP error codes added to handle L2CAP CoC behviour effect RFCOMM... 

Merge "L2CAP error codes added to handle L2CAP CoC behviour effect RFCOMM handling of L2CAP events." am: 95131410 am: e79e7f9d

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



Change-Id: I1b379c6a47cb0936dadd319bd8954fc26ae29f50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15b3e4d2 e79e7f9d

system/stack/l2cap/l2c_csm.cc

+2 −2
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static void l2c_csm_closed(tL2C_CCB* p_ccb, tL2CEVT event, void* p_data) { 


    case L2CEVT_TIMEOUT:

      l2cu_release_ccb(p_ccb);

      (*p_ccb->p_rcb->api.pL2CA_Error_Cb)(local_cid, L2CAP_CONN_TIMEOUT);

      (*p_ccb->p_rcb->api.pL2CA_Error_Cb)(local_cid, L2CAP_CONN_OTHER_ERROR);

      bluetooth::shim::CountCounterMetrics(

          android::bluetooth::CodePathCounterKeyEnum::

              L2CAP_TIMEOUT_AT_CSM_CLOSED,
@@ -717,7 +717,7 @@ static void l2c_csm_w4_l2cap_connect_rsp(tL2C_CCB* p_ccb, tL2CEVT event, 
        (*p_ccb->p_rcb->api.pL2CA_Error_Cb)(

            local_cid, le_result_to_l2c_conn(p_ci->l2cap_result));

      } else {

        (*p_ccb->p_rcb->api.pL2CA_Error_Cb)(local_cid, p_ci->l2cap_result);

        (*p_ccb->p_rcb->api.pL2CA_Error_Cb)(local_cid, L2CAP_CONN_OTHER_ERROR);

      }

      bluetooth::shim::CountCounterMetrics(

          android::bluetooth::CodePathCounterKeyEnum::L2CAP_CONNECT_RSP_NEG, 1);