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

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

Merge "Add in enable address resolution to le_address_manager"

parents 27afd7ea 120e7da4

system/gd/hci/le_address_manager.cc

+39 −3
Original line number Diff line number Diff line
@@ -381,10 +381,22 @@ void LeAddressManager::AddDeviceToResolvingList( 
    Address peer_identity_address,

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

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

  // Disable Address resolution

  auto disable_builder = hci::LeSetAddressResolutionEnableBuilder::Create(hci::Enable::DISABLED);

  Command disable = {CommandType::SET_ADDRESS_RESOLUTION_ENABLE, std::move(disable_builder)};

  cached_commands_.push(std::move(disable));



  auto packet_builder = hci::LeAddDeviceToResolvingListBuilder::Create(

      peer_identity_address_type, peer_identity_address, peer_irk, local_irk);

  Command command = {CommandType::ADD_DEVICE_TO_RESOLVING_LIST, std::move(packet_builder)};

  handler_->BindOnceOn(this, &LeAddressManager::push_command, std::move(command)).Invoke();

  cached_commands_.push(std::move(command));



  // Enable Address resolution

  auto enable_builder = hci::LeSetAddressResolutionEnableBuilder::Create(hci::Enable::ENABLED);

  Command enable = {CommandType::SET_ADDRESS_RESOLUTION_ENABLE, std::move(enable_builder)};

  cached_commands_.push(std::move(enable));



  pause_registered_clients();

}



void LeAddressManager::RemoveDeviceFromConnectList(
@@ -396,10 +408,22 @@ void LeAddressManager::RemoveDeviceFromConnectList( 


void LeAddressManager::RemoveDeviceFromResolvingList(

    PeerAddressType peer_identity_address_type, Address peer_identity_address) {

  // Disable Address resolution

  auto disable_builder = hci::LeSetAddressResolutionEnableBuilder::Create(hci::Enable::DISABLED);

  Command disable = {CommandType::SET_ADDRESS_RESOLUTION_ENABLE, std::move(disable_builder)};

  cached_commands_.push(std::move(disable));



  auto packet_builder =

      hci::LeRemoveDeviceFromResolvingListBuilder::Create(peer_identity_address_type, peer_identity_address);

  Command command = {CommandType::REMOVE_DEVICE_FROM_RESOLVING_LIST, std::move(packet_builder)};

  handler_->BindOnceOn(this, &LeAddressManager::push_command, std::move(command)).Invoke();

  cached_commands_.push(std::move(command));



  // Enable Address resolution

  auto enable_builder = hci::LeSetAddressResolutionEnableBuilder::Create(hci::Enable::ENABLED);

  Command enable = {CommandType::SET_ADDRESS_RESOLUTION_ENABLE, std::move(enable_builder)};

  cached_commands_.push(std::move(enable));



  pause_registered_clients();

}



void LeAddressManager::ClearConnectList() {
@@ -409,9 +433,21 @@ void LeAddressManager::ClearConnectList() { 
}



void LeAddressManager::ClearResolvingList() {

  // Disable Address resolution

  auto disable_builder = hci::LeSetAddressResolutionEnableBuilder::Create(hci::Enable::DISABLED);

  Command disable = {CommandType::SET_ADDRESS_RESOLUTION_ENABLE, std::move(disable_builder)};

  cached_commands_.push(std::move(disable));



  auto packet_builder = hci::LeClearResolvingListBuilder::Create();

  Command command = {CommandType::CLEAR_RESOLVING_LIST, std::move(packet_builder)};

  handler_->BindOnceOn(this, &LeAddressManager::push_command, std::move(command)).Invoke();

  cached_commands_.push(std::move(command));



  // Enable Address resolution

  auto enable_builder = hci::LeSetAddressResolutionEnableBuilder::Create(hci::Enable::ENABLED);

  Command enable = {CommandType::SET_ADDRESS_RESOLUTION_ENABLE, std::move(enable_builder)};

  cached_commands_.push(std::move(enable));



  pause_registered_clients();

}



void LeAddressManager::OnCommandComplete(bluetooth::hci::CommandCompleteView view) {

system/gd/hci/le_address_manager.h

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ class LeAddressManager { 
    CLEAR_CONNECT_LIST,

    ADD_DEVICE_TO_RESOLVING_LIST,

    REMOVE_DEVICE_FROM_RESOLVING_LIST,

    CLEAR_RESOLVING_LIST

    CLEAR_RESOLVING_LIST,

    SET_ADDRESS_RESOLUTION_ENABLE

  };



  struct Command {