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

Commit af06ddeb authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

GAP: Simplify gap_sec_check_complete am: 89e87d64 

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

Change-Id: I1fb87be1e558497482f9fae53e2a2a0559406304
parents 3cbebe0d 89e87d64

system/stack/gap/gap_conn.cc

+4 −16
Original line number Diff line number Diff line
@@ -661,22 +661,10 @@ static void gap_checks_con_flags(tGAP_CCB* p_ccb) { 
 * Returns          void

 *

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

static void gap_sec_check_complete(const RawAddress*, tBT_TRANSPORT,

                                   void* p_ref_data, uint8_t res) {

  tGAP_CCB* p_ccb = (tGAP_CCB*)p_ref_data;



  DVLOG(1) << StringPrintf(

      "gap_sec_check_complete conn_state:%d, conn_flags:0x%x, status:%d",

      p_ccb->con_state, p_ccb->con_flags, res);

static void gap_sec_check_complete(tGAP_CCB* p_ccb) {

  if (p_ccb->con_state == GAP_CCB_STATE_IDLE) return;



  if (res == BTM_SUCCESS) {

  p_ccb->con_flags |= GAP_CCB_FLAGS_SEC_DONE;

  gap_checks_con_flags(p_ccb);

  } else {

    /* security failed - disconnect the channel */

    L2CA_DisconnectReq(p_ccb->connection_id);

  }

}



static void gap_on_l2cap_error(uint16_t l2cap_cid, uint16_t result) {
@@ -712,7 +700,7 @@ static void gap_connect_cfm(uint16_t l2cap_cid, uint16_t result) { 
  if ((p_ccb->con_flags & GAP_CCB_FLAGS_SEC_DONE) == 0 &&

      p_ccb->transport != BT_TRANSPORT_LE) {

    // Assume security check is done by L2cap

    gap_sec_check_complete(nullptr, BT_TRANSPORT_BR_EDR, p_ccb, BTM_SUCCESS);

    gap_sec_check_complete(p_ccb);

  }



  /* If the connection response contains success status, then */