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

Commit 5a1a67b7 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Automerger Merge Worker
Browse files

Merge "floss: Drop Connect Complete with bad handle" am: 4a6631bf 

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



Change-Id: I723121c16f58a16a313b5ed55ce2bf1abcc199dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e4c6a85 4a6631bf

system/gd/hci/acl_manager/classic_impl.h

+22 −0
Original line number Diff line number Diff line
@@ -384,6 +384,28 @@ struct classic_impl : public security::ISecurityManagerListener { 
    ASSERT(connection_complete.IsValid());

    auto status = connection_complete.GetStatus();

    auto address = connection_complete.GetBdAddr();



    // TODO(b/261610529) - Some controllers incorrectly return connection

    // failures via HCI Connect Complete instead of SCO connect complete.

    // Temporarily just drop these packets until we have finer grained control

    // over these ASSERTs.

#if TARGET_FLOSS

    auto handle = connection_complete.GetConnectionHandle();

    auto link_type = connection_complete.GetLinkType();



    // HACK: Some failed SCO connections are reporting failures via

    //       ConnectComplete instead of ScoConnectionComplete.

    //       Drop such packets.

    if (handle == 0xffff && link_type == LinkType::SCO) {

      LOG_ERROR(

          "ConnectionComplete with invalid handle(%u), link type(%u) and status(%d). Dropping packet.",

          handle,

          link_type,

          status);

      return;

    }

#endif



    acl_scheduler_->ReportAclConnectionCompletion(

        address,

        handler_->BindOnceOn(