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

Commit 9dda106c authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "le_address_manager: Add command complete status checks" am: 8aa15a97 

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



Change-Id: I468de2e8ce0092af0e5203c13a9e188e29dd1f72
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7487b11 8aa15a97

system/gd/hci/le_address_manager.cc

+78 −18
Original line number Original line Diff line number Diff line
@@ -473,16 +473,36 @@ void LeAddressManager::ClearResolvingList() { 
  pause_registered_clients();

  pause_registered_clients();

}

}





template <class View>

void LeAddressManager::on_command_complete(CommandCompleteView view) {

  auto op_code = view.GetCommandOpCode();



  auto complete_view = View::Create(view);

  if (!complete_view.IsValid()) {

    LOG_ERROR("Received %s complete with invalid packet", hci::OpCodeText(op_code).c_str());

    return;

  }

  auto status = complete_view.GetStatus();

  if (status != ErrorCode::SUCCESS) {

    LOG_ERROR(

        "Received %s complete with status %s",

        hci::OpCodeText(op_code).c_str(),

        ErrorCodeText(complete_view.GetStatus()).c_str());

  }

}



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

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

  if (!view.IsValid()) {

  if (!view.IsValid()) {

    LOG_ERROR("Received command complete with invalid packet");

    LOG_ERROR("Received command complete with invalid packet");

    return;

    return;

  }

  }

  std::string op_code = OpCodeText(view.GetCommandOpCode());

  auto op_code = view.GetCommandOpCode();

  LOG_INFO("Received command complete with op_code %s", op_code.c_str());

  LOG_INFO("Received command complete with op_code %s", OpCodeText(op_code).c_str());





  // The command was sent before any client registered, we can make sure all the clients paused when command complete.

  switch (op_code) {

  if (view.GetCommandOpCode() == OpCode::LE_SET_RANDOM_ADDRESS) {

    case OpCode::LE_SET_RANDOM_ADDRESS: {

      // The command was sent before any client registered, we can make sure all the clients paused when command

      // complete.

      if (address_policy_ == AddressPolicy::USE_STATIC_ADDRESS) {

      if (address_policy_ == AddressPolicy::USE_STATIC_ADDRESS) {

        LOG_INFO("Received LE_SET_RANDOM_ADDRESS complete and Address policy is USE_STATIC_ADDRESS, return");

        LOG_INFO("Received LE_SET_RANDOM_ADDRESS complete and Address policy is USE_STATIC_ADDRESS, return");

        return;

        return;
@@ -490,14 +510,54 @@ void LeAddressManager::OnCommandComplete(bluetooth::hci::CommandCompleteView vie 
      auto complete_view = LeSetRandomAddressCompleteView::Create(view);

      auto complete_view = LeSetRandomAddressCompleteView::Create(view);

      if (!complete_view.IsValid()) {

      if (!complete_view.IsValid()) {

        LOG_ERROR("Received LE_SET_RANDOM_ADDRESS complete with invalid packet");

        LOG_ERROR("Received LE_SET_RANDOM_ADDRESS complete with invalid packet");

    } else if (complete_view.IsValid() && complete_view.GetStatus() != ErrorCode::SUCCESS) {

      } else {

        if (complete_view.GetStatus() != ErrorCode::SUCCESS) {

          LOG_ERROR(

          LOG_ERROR(

          "Received LE_SET_RANDOM_ADDRESS complete with status %s", ErrorCodeText(complete_view.GetStatus()).c_str());

              "Received LE_SET_RANDOM_ADDRESS complete with status %s",

              ErrorCodeText(complete_view.GetStatus()).c_str());

        } else {

        } else {

          LOG_INFO("update random address : %s", cached_address_.GetAddress().ToString().c_str());

          LOG_INFO("update random address : %s", cached_address_.GetAddress().ToString().c_str());

          le_address_ = cached_address_;

          le_address_ = cached_address_;

        }

        }

      }

      }

    } break;



    case OpCode::LE_SET_PRIVACY_MODE:

      on_command_complete<LeSetPrivacyModeCompleteView>(view);

      break;



    case OpCode::LE_ADD_DEVICE_TO_RESOLVING_LIST:

      on_command_complete<LeAddDeviceToResolvingListCompleteView>(view);

      break;



    case OpCode::LE_REMOVE_DEVICE_FROM_RESOLVING_LIST:

      on_command_complete<LeRemoveDeviceFromResolvingListCompleteView>(view);

      break;



    case OpCode::LE_CLEAR_RESOLVING_LIST:

      on_command_complete<LeClearResolvingListCompleteView>(view);

      break;



    case OpCode::LE_ADD_DEVICE_TO_CONNECT_LIST:

      on_command_complete<LeAddDeviceToConnectListCompleteView>(view);

      break;



    case OpCode::LE_REMOVE_DEVICE_FROM_CONNECT_LIST:

      on_command_complete<LeAddDeviceToConnectListCompleteView>(view);

      break;



    case OpCode::LE_SET_ADDRESS_RESOLUTION_ENABLE:

      on_command_complete<LeSetAddressResolutionEnableCompleteView>(view);

      break;



    case OpCode::LE_CLEAR_CONNECT_LIST:

      on_command_complete<LeClearConnectListCompleteView>(view);

      break;



    default:

      LOG_ERROR("Received UNSUPPORTED command %s complete", hci::OpCodeText(op_code).c_str());

      break;

  }





  handler_->BindOnceOn(this, &LeAddressManager::check_cached_commands).Invoke();

  handler_->BindOnceOn(this, &LeAddressManager::check_cached_commands).Invoke();

}

}

system/gd/hci/le_address_manager.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -130,6 +130,8 @@ class LeAddressManager { 
  hci::Address generate_nrpa();

  hci::Address generate_nrpa();

  void handle_next_command();

  void handle_next_command();

  void check_cached_commands();

  void check_cached_commands();

  template <class View>

  void on_command_complete(CommandCompleteView view);





  common::Callback<void(std::unique_ptr<CommandBuilder>)> enqueue_command_;

  common::Callback<void(std::unique_ptr<CommandBuilder>)> enqueue_command_;

  os::Handler* handler_;

  os::Handler* handler_;