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

Commit ff391ea6 authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

Merge "acl manager Move from reference to const reference" am: 7c5aa34e 

am: ba8d7b23

Change-Id: Ibabea6f7bc4015600bd6d2d1e5023a97aae6cb15
parents b6c53ac0 ba8d7b23

system/gd/hci/acl_manager.cc

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct AclManager::acl_connection { 
};



struct AclManager::impl {

  impl(AclManager& acl_manager) : acl_manager_(acl_manager) {}

  impl(const AclManager& acl_manager) : acl_manager_(acl_manager) {}



  void Start() {

    hci_layer_ = acl_manager_.GetDependency<HciLayer>();
@@ -1580,7 +1580,7 @@ struct AclManager::impl { 
    handler_->Post(BindOnce(&impl::cleanup, common::Unretained(this), handle));

  }



  AclManager& acl_manager_;

  const AclManager& acl_manager_;



  Controller* controller_ = nullptr;

  uint16_t max_acl_packet_credits_ = 0;

system/gd/hci/acl_manager.h

+3 −3
Original line number Diff line number Diff line
@@ -150,11 +150,11 @@ class AclConnection { 


 private:

  friend AclManager;

  AclConnection(AclManager* manager, uint16_t handle, Address address)

  AclConnection(const AclManager* manager, uint16_t handle, Address address)

      : manager_(manager), handle_(handle), address_(address) {}

  AclConnection(AclManager* manager, uint16_t handle, Address address, AddressType address_type, Role role)

  AclConnection(const AclManager* manager, uint16_t handle, Address address, AddressType address_type, Role role)

      : manager_(manager), handle_(handle), address_(address), address_type_(address_type), role_(role) {}

  AclManager* manager_;

  const AclManager* manager_;

  uint16_t handle_;

  Address address_;

  AddressType address_type_;