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

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

Merge "Return control flow upon duplicate connection detected" am: 294466d7... 

Merge "Return control flow upon duplicate connection detected" am: 294466d7 am: eecfe1b9 am: 3835d789

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



Change-Id: I07a566cc0e8d0f0f29b63318eccded2a0dd26a75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4cd191e2 3835d789

system/gd/hci/acl_manager/classic_impl.h

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ struct classic_impl : public security::ISecurityManagerListener { 
    if (is_classic_link_already_connected(address)) {

      LOG_WARN("already connected: %s", ADDRESS_TO_LOGGABLE_CSTR(address));

      acl_scheduler_->ReportOutgoingAclConnectionFailure();

      return;

    }

    acl_connection_interface_->EnqueueCommand(

        std::move(packet), handler_->BindOnceOn(this, &classic_impl::on_create_connection_status, address));