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

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

gd_acl: SCO temporary fix am: 91d348bc 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idddf309b8444975705789a2adeae729b398ae45c
parents b38a287d 91d348bc

system/stack/acl/btm_acl.cc

+5 −1
Original line number Diff line number Diff line
@@ -2830,8 +2830,12 @@ void acl_disconnect_after_role_switch(uint16_t conn_handle, 
                                      tHCI_STATUS reason) {

  tACL_CONN* p_acl = internal_.acl_get_connection_from_handle(conn_handle);

  if (p_acl == nullptr) {

    LOG_ERROR("Sending disconnect for unknown acl PLEASE FIX");

    LOG_ERROR("Sending disconnect for unknown acl:%hu PLEASE FIX", conn_handle);

    GetLegacyHciInterface().Disconnect(conn_handle, reason);

    if (bluetooth::shim::is_gd_acl_enabled() &&

        btm_sco_removed(conn_handle, HCI_ERR_CONN_CAUSE_LOCAL_HOST))

      LOG_ERROR(

          "Assuming this was a SCO connection and short circuiting disconnect");

    return;

  }