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

Commit 972f3c11 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Simplify bnep_on_l2cap_error 

Both cases are doing the same thing.

Error reason isn't used throughout the stack.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib3793f96c0d8a2907fc41d9a24712d2db78a0665
parent 096c6dd7

system/stack/bnep/bnep_main.cc

+7 −20
Original line number Diff line number Diff line
@@ -137,29 +137,16 @@ static void bnep_connect_ind(const RawAddress& bd_addr, uint16_t l2cap_cid, 
static void bnep_on_l2cap_error(uint16_t l2cap_cid, uint16_t result) {

  tBNEP_CONN* p_bcb = bnepu_find_bcb_by_cid(l2cap_cid);



  if (p_bcb->con_state == BNEP_STATE_CONN_START) {

    BNEP_TRACE_WARNING("BNEP - Rcvd conn cnf with error: 0x%x  CID 0x%x",

                       result, p_bcb->l2cap_cid);



    /* Tell the upper layer, if there is a callback */

    if (bnep_cb.p_conn_state_cb && p_bcb->con_flags & BNEP_FLAGS_IS_ORIG) {

      (*bnep_cb.p_conn_state_cb)(p_bcb->handle, p_bcb->rem_bda,

                                 BNEP_CONN_FAILED, false);

    }



    bnepu_release_bcb(p_bcb);

  } else {

  /* Tell the upper layer, if there is a callback */

  if ((p_bcb->con_flags & BNEP_FLAGS_IS_ORIG) && (bnep_cb.p_conn_state_cb)) {

      (*bnep_cb.p_conn_state_cb)(p_bcb->handle, p_bcb->rem_bda,

                                 BNEP_CONN_FAILED_CFG, false);

    (*bnep_cb.p_conn_state_cb)(p_bcb->handle, p_bcb->rem_bda, BNEP_CONN_FAILED,

                               false);

  }



  L2CA_DisconnectReq(p_bcb->l2cap_cid);



  bnepu_release_bcb(p_bcb);

}

}



/*******************************************************************************

 *