OSDN Git Service

HACK: Remove SCO disconnect short circuit
authorChris Manton <cmanton@google.com>
Sun, 17 Jan 2021 16:58:31 +0000 (08:58 -0800)
committerChris Manton <cmanton@google.com>
Wed, 20 Jan 2021 16:05:28 +0000 (08:05 -0800)
Bug: 177382279
Tag: #refactor
Test: gd/cert/run

Change-Id: Ic6aa1f96f7f5dafa9287fa4be6f6d4966a9c5e80

stack/acl/btm_acl.cc

index 7439296..72e063c 100644 (file)
@@ -2834,10 +2834,6 @@ void acl_disconnect_after_role_switch(uint16_t conn_handle,
   if (p_acl == nullptr) {
     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;
   }