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

Commit f79bd4c5 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Re-log stack/acl/btm_acl::acl_disconnect_after_role_switch am: 2836bf16 am: 545e59af 

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

Change-Id: Iaa617de53fac81e9a73a27654a0777b91feb0673
parents e6c791bc 545e59af

system/stack/acl/btm_acl.cc

+6 −5
Original line number Diff line number Diff line
@@ -2686,13 +2686,14 @@ void acl_disconnect_after_role_switch(uint16_t conn_handle, uint16_t reason) { 
  /* If a role switch is in progress, delay the HCI Disconnect to avoid

   * controller problem */

  if (p_acl->rs_disc_pending == BTM_SEC_RS_PENDING) {

    BTM_TRACE_DEBUG(

        "RS in progress - Set DISC Pending flag in btm_sec_send_hci_disconnect "

    LOG_DEBUG(

        "Role switch in progress - Set DISC Pending flag in "

        "btm_sec_send_hci_disconnect "

        "to delay disconnect");

    p_acl->rs_disc_pending = BTM_SEC_DISC_PENDING;

  }

  /* Tear down the HCI link */

  else {

  } else {

    LOG_DEBUG("Sending acl disconnect reason:%s [%hu]",

              hci_error_code_text(reason).c_str(), reason);

    btsnd_hcic_disconnect(conn_handle, reason);

  }

}