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

Commit 8aae302d authored by Chienyuan's avatar Chienyuan Committed by Automerger Merge Worker
Browse files

gd: Implement timeout callback for direct le connection am: 4b15b1e7 

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

Change-Id: I9139641c3c5636fe707db452653f21f8130a90db
parents 19bbd8a5 4b15b1e7

system/gd/hci/acl_manager/le_impl.h

+25 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ constexpr uint16_t kScanIntervalFast = 0x0060; 
constexpr uint16_t kScanWindowFast = 0x0030;

constexpr uint16_t kScanIntervalSlow = 0x0800;

constexpr uint16_t kScanWindowSlow = 0x0030;

constexpr std::chrono::milliseconds kCreateConnectionTimeoutMs = std::chrono::milliseconds(30 * 1000);



struct le_acl_connection {

  le_acl_connection(AddressWithType remote_address, AclConnection::QueueDownEnd* queue_down_end, os::Handler* handler)
@@ -134,6 +135,10 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    } else {

      connecting_le_.erase(connecting_addr_with_type);

    }

    if (create_connection_timeout_alarms_.find(address_with_type) != create_connection_timeout_alarms_.end()) {

      create_connection_timeout_alarms_.at(address_with_type).Cancel();

      create_connection_timeout_alarms_.erase(address_with_type);

    }

  }



  void on_le_connection_complete(LeMetaEventView packet) {
@@ -409,6 +414,16 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
      add_device_to_connect_list(address_with_type);

      if (is_direct) {

        direct_connections_.insert(address_with_type);

        if (create_connection_timeout_alarms_.find(address_with_type) == create_connection_timeout_alarms_.end()) {

          create_connection_timeout_alarms_.emplace(

              std::piecewise_construct,

              std::forward_as_tuple(address_with_type.GetAddress(), address_with_type.GetAddressType()),

              std::forward_as_tuple(handler_));

          create_connection_timeout_alarms_.at(address_with_type)

              .Schedule(

                  common::BindOnce(&le_impl::on_create_connection_timeout, common::Unretained(this), address_with_type),

                  kCreateConnectionTimeoutMs);

        }

      }

    }
@@ -486,6 +501,15 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    }

  }



  void on_create_connection_timeout(AddressWithType address_with_type) {

    LOG_INFO("on_create_connection_timeout, address: %s", address_with_type.ToString().c_str());

    if (create_connection_timeout_alarms_.find(address_with_type) != create_connection_timeout_alarms_.end()) {

      create_connection_timeout_alarms_.at(address_with_type).Cancel();

      create_connection_timeout_alarms_.erase(address_with_type);

      cancel_connect(address_with_type);

    }

  }



  void cancel_connect(AddressWithType address_with_type) {

    // the connection will be canceled by LeAddressManager.OnPause()

    remove_device_from_connect_list(address_with_type);
@@ -677,6 +701,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
  bool ready_to_unregister = false;

  bool pause_connection = false;

  bool crash_on_unknown_handle_ = false;

  std::map<AddressWithType, os::Alarm> create_connection_timeout_alarms_;

};



}  // namespace acl_manager