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

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

Merge "Add connection address into gd connection" am: 74830dca 

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

Change-Id: Ic4f051a345e578d962fd3aa21b049bb30f643093
parents af4967aa 74830dca

system/gd/hci/acl_manager/le_acl_connection.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ class LeAclConnection : public AclConnection { 
    return role_;

  }



  // The peer address and type returned from the Connection Complete Event

  AddressWithType peer_address_with_type_;



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

  virtual void Disconnect(DisconnectReason reason);

system/gd/hci/acl_manager/le_impl.h

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    round_robin_scheduler_->Register(RoundRobinScheduler::ConnectionType::LE, handle, queue);

    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_proxy.le_connection_management_callbacks_ = connection->GetEventCallbacks();

    le_client_handler_->Post(common::BindOnce(&LeConnectionCallbacks::OnLeConnectSuccess,

                                              common::Unretained(le_client_callbacks_), remote_address,
@@ -270,6 +271,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    round_robin_scheduler_->Register(RoundRobinScheduler::ConnectionType::LE, handle, queue);

    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_proxy.le_connection_management_callbacks_ = connection->GetEventCallbacks();

    le_client_handler_->Post(common::BindOnce(&LeConnectionCallbacks::OnLeConnectSuccess,

                                              common::Unretained(le_client_callbacks_), remote_address,