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

Commit c62bb3d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I6322c99c,Id973755e 

* changes:
  Pass connection parameter to OnLeConnectSuccess
  LE Shim: Implement ReadRemoteControllerInformation
parents 811fd27c b90f492a

system/gd/hci/acl_manager/le_acl_connection.cc

+15 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ class LeAclConnectionTracker : public LeConnectionManagementCallbacks { 
        connection_handle_, static_cast<uint8_t>(hci_status), lmp_version, manufacturer_name, sub_version);

    SAVE_OR_CALL(OnReadRemoteVersionInformationComplete, hci_status, lmp_version, manufacturer_name, sub_version);

  }



  void OnLeReadRemoteFeaturesComplete(hci::ErrorCode hci_status, uint64_t features) override {

    SAVE_OR_CALL(OnLeReadRemoteFeaturesComplete, hci_status, features);

  }



  void OnPhyUpdate(hci::ErrorCode hci_status, uint8_t tx_phy, uint8_t rx_phy) override {

    SAVE_OR_CALL(OnPhyUpdate, hci_status, tx_phy, rx_phy);

  }
@@ -171,6 +176,16 @@ bool LeAclConnection::ReadRemoteVersionInformation() { 
  return true;

}



bool LeAclConnection::LeReadRemoteFeatures() {

  pimpl_->tracker.le_acl_connection_interface_->EnqueueCommand(

      LeReadRemoteFeaturesBuilder::Create(handle_),

      pimpl_->tracker.client_handler_->BindOnce([](CommandStatusView status) {

        ASSERT(status.IsValid());

        ASSERT(status.GetCommandOpCode() == OpCode::LE_READ_REMOTE_FEATURES);

      }));

  return true;

}



bool LeAclConnection::check_connection_parameters(

    uint16_t conn_interval_min, uint16_t conn_interval_max, uint16_t conn_latency, uint16_t supervision_timeout) {

  if (conn_interval_min < 0x0006 || conn_interval_min > 0x0C80 || conn_interval_max < 0x0006 ||

system/gd/hci/acl_manager/le_acl_connection.h

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ class LeAclConnection : public AclConnection { 
  // Time Range: 100 ms to 32 s

  uint16_t supervision_timeout_;



  Address local_resolvable_private_address_ = Address::kEmpty;

  Address peer_resolvable_private_address_ = Address::kEmpty;



  virtual void RegisterCallbacks(LeConnectionManagementCallbacks* callbacks, os::Handler* handler);

  virtual void Disconnect(DisconnectReason reason);
@@ -85,6 +88,7 @@ class LeAclConnection : public AclConnection { 
                                  uint16_t supervision_timeout, uint16_t min_ce_length, uint16_t max_ce_length);



  virtual bool ReadRemoteVersionInformation() override;

  virtual bool LeReadRemoteFeatures();



  // TODO implement LeRemoteConnectionParameterRequestReply, LeRemoteConnectionParameterRequestNegativeReply

system/gd/hci/acl_manager/le_connection_management_callbacks.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ class LeConnectionManagementCallbacks { 
  virtual void OnDisconnection(ErrorCode reason) = 0;

  virtual void OnReadRemoteVersionInformationComplete(

      hci::ErrorCode hci_status, uint8_t lmp_version, uint16_t manufacturer_name, uint16_t sub_version) = 0;

  virtual void OnLeReadRemoteFeaturesComplete(hci::ErrorCode hci_status, uint64_t features) = 0;

  virtual void OnPhyUpdate(hci::ErrorCode hci_status, uint8_t tx_phy, uint8_t rx_phy) = 0;

  virtual void OnLocalAddressUpdate(AddressWithType address_with_type) = 0;

};

system/gd/hci/acl_manager/le_impl.h

+9 −0
Original line number Diff line number Diff line
@@ -341,6 +341,9 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    std::unique_ptr<LeAclConnection> connection(new LeAclConnection(

        std::move(queue), le_acl_connection_interface_, handle, local_address, remote_address, role));

    connection->peer_address_with_type_ = AddressWithType(address, peer_address_type);

    connection->interval_ = conn_interval;

    connection->latency_ = conn_latency;

    connection->supervision_timeout_ = supervision_timeout;

    connections.add(

        handle, remote_address, queue_down_end, handler_, connection->GetEventCallbacks([this](uint16_t handle) {

          this->connections.invalidate(handle);
@@ -426,6 +429,12 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    std::unique_ptr<LeAclConnection> connection(new LeAclConnection(

        std::move(queue), le_acl_connection_interface_, handle, local_address, remote_address, role));

    connection->peer_address_with_type_ = AddressWithType(address, peer_address_type);

    connection->interval_ = conn_interval;

    connection->latency_ = conn_latency;

    connection->supervision_timeout_ = supervision_timeout;

    connection->local_resolvable_private_address_ = connection_complete.GetLocalResolvablePrivateAddress();

    connection->peer_resolvable_private_address_ = connection_complete.GetPeerResolvablePrivateAddress();

    connection_complete.GetLocalResolvablePrivateAddress();

    connections.add(

        handle, remote_address, queue_down_end, handler_, connection->GetEventCallbacks([this](uint16_t handle) {

          this->connections.invalidate(handle);

system/gd/hci/acl_manager_test.cc

+1 −0
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ class AclManagerWithLeConnectionTest : public AclManagerTest { 
    MOCK_METHOD4(

        OnReadRemoteVersionInformationComplete,

        void(hci::ErrorCode hci_status, uint8_t version, uint16_t manufacturer_name, uint16_t sub_version));

    MOCK_METHOD2(OnLeReadRemoteFeaturesComplete, void(hci::ErrorCode hci_status, uint64_t features));

    MOCK_METHOD3(OnPhyUpdate, void(hci::ErrorCode hci_status, uint8_t tx_phy, uint8_t rx_phy));

    MOCK_METHOD1(OnLocalAddressUpdate, void(AddressWithType address_with_type));

  } mock_le_connection_management_callbacks_;