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

Commit aa64bf29 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "HCI: Accept erroneous ConnectionComplete" am: cbd7a703 

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

Change-Id: I0de79dd1131a5fb4f63dd8f90c30646025f3b91a
parents 2a7b97a7 cbd7a703

system/gd/hci/acl_manager/classic_impl.h

+5 −0
Original line number Diff line number Diff line
@@ -240,6 +240,11 @@ struct classic_impl : public security::ISecurityManagerListener { 
      outgoing_connecting_address_ = Address::kEmpty;

    } else {

      locally_initiated = false;

      if (incoming_connecting_address_ != address && status == ErrorCode::UNKNOWN_CONNECTION) {

        LOG_WARN("No matching connection to %s (%s)", address.ToString().c_str(), ErrorCodeText(status).c_str());

        LOG_WARN("Firmware error after RemoteNameRequestCancel?");

        return;

      }

      ASSERT_LOG(incoming_connecting_address_ == address, "No prior connection request for %s",

                 address.ToString().c_str());

      incoming_connecting_address_ = Address::kEmpty;