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

Commit a3696144 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Remove flagged GATT call to connection manager" into main am: 3a03f4c5 

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



Change-Id: I0555a243a390e5afe37f8b09a9b298c8b89c0347
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 955370f6 3a03f4c5

system/stack/acl/btm_acl.cc

+0 −13
Original line number Diff line number Diff line
@@ -203,19 +203,6 @@ static void disconnect_acl(tACL_CONN& p_acl, tHCI_STATUS reason, 
           hci_error_code_text(reason).c_str(), comment.c_str());

  p_acl.disconnect_reason = reason;



  if (bluetooth::common::init_flags::

          use_unified_connection_manager_is_enabled()) {

    if (!p_acl.is_transport_br_edr()) {

      // TODO(aryarahul): this should be moved into GATT, so when a client

      // disconnects, it removes its request to autoConnect, even if the ACL

      // link stays up due to the presence of other clients.

      bluetooth::connection::GetConnectionManager()

          .stop_all_connections_to_device(bluetooth::core::ToRustAddress(

              tBLE_BD_ADDR{.type = p_acl.active_remote_addr_type,

                           .bda = p_acl.active_remote_addr}));

    }

  }



  return bluetooth::shim::ACL_Disconnect(

      p_acl.hci_handle, p_acl.is_transport_br_edr(), reason, comment);

}