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

Commit 77369fb1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix connect fail when bonding then connect" into main am: cc5c828b 

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



Change-Id: I458490f748121db98d7ef9406e4861160fddfc2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53b9fb74 cc5c828b

system/stack/l2cap/l2c_utils.cc

+6 −1
Original line number Diff line number Diff line
@@ -2665,7 +2665,12 @@ bool l2cu_initialize_fixed_ccb(tL2C_LCB* p_lcb, uint16_t fixed_cid) { 
  p_ccb = l2cu_allocate_ccb(NULL, 0);

  if (p_ccb == NULL) return (false);



  if (p_lcb->link_state == LST_DISCONNECTED) {

    alarm_cancel(p_lcb->l2c_lcb_timer);

  } else {

    LOG_WARN("Unable to cancel link control block for link connection to device %s",

                 ADDRESS_TO_LOGGABLE_CSTR(p_lcb->remote_bd_addr));

  }



  /* Set CID for the connection */

  p_ccb->local_cid = fixed_cid;