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

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

Merge "Plumb acl_manager Clear Address Resolving List"

parents 5ee8d9fd e5f6b2f8

system/gd/hci/acl_manager.cc

+8 −4
Original line number Diff line number Diff line
@@ -220,6 +220,10 @@ void AclManager::AddDeviceToConnectList(AddressWithType address_with_type) { 
  CallOn(pimpl_->le_impl_, &le_impl::add_device_to_connect_list, address_with_type);

}



void AclManager::RemoveDeviceFromConnectList(AddressWithType address_with_type) {

  CallOn(pimpl_->le_impl_, &le_impl::remove_device_from_connect_list, address_with_type);

}



void AclManager::AddDeviceToResolvingList(

    AddressWithType address_with_type,

    const std::array<uint8_t, 16>& peer_irk,
@@ -227,14 +231,14 @@ void AclManager::AddDeviceToResolvingList( 
  CallOn(pimpl_->le_impl_, &le_impl::add_device_to_resolving_list, address_with_type, peer_irk, local_irk);

}



void AclManager::RemoveDeviceFromConnectList(AddressWithType address_with_type) {

  CallOn(pimpl_->le_impl_, &le_impl::remove_device_from_connect_list, address_with_type);

}



void AclManager::RemoveDeviceFromResolvingList(AddressWithType address_with_type) {

  CallOn(pimpl_->le_impl_, &le_impl::remove_device_from_resolving_list, address_with_type);

}



void AclManager::ClearResolvingList() {

  CallOn(pimpl_->le_impl_, &le_impl::clear_resolving_list);

}



void AclManager::CentralLinkKey(KeyFlag key_flag) {

  CallOn(pimpl_->classic_impl_, &classic_impl::central_link_key, key_flag);

}

system/gd/hci/acl_manager.h

+2 −1
Original line number Diff line number Diff line
@@ -101,12 +101,13 @@ public: 


 virtual void CancelLeConnect(AddressWithType address_with_type);

 virtual void AddDeviceToConnectList(AddressWithType address_with_type);

 virtual void RemoveDeviceFromConnectList(AddressWithType address_with_type);

 virtual void AddDeviceToResolvingList(

     AddressWithType address_with_type,

     const std::array<uint8_t, 16>& peer_irk,

     const std::array<uint8_t, 16>& local_irk);

 virtual void RemoveDeviceFromConnectList(AddressWithType address_with_type);

 virtual void RemoveDeviceFromResolvingList(AddressWithType address_with_type);

 virtual void ClearResolvingList();



 virtual void CentralLinkKey(KeyFlag key_flag);

 virtual void SwitchRole(Address address, Role role);

system/gd/hci/acl_manager/le_impl.h

+4 −0
Original line number Diff line number Diff line
@@ -625,6 +625,10 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    }

  }



  void clear_resolving_list() {

    le_address_manager_->ClearResolvingList();

  }



  void set_privacy_policy_for_initiator_address(

      LeAddressManager::AddressPolicy address_policy,

      AddressWithType fixed_address,