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

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

Merge changes Iddb9d483,Ia3af25d2 am: 57aea359 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1516267

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I766f66298a22e8da1007fc18511c091486f054ba
parents fa5410e3 57aea359

system/gd/hci/acl_manager_test.cc

+5 −5
Original line number Diff line number Diff line
@@ -1259,16 +1259,16 @@ TEST_F(AclManagerWithResolvableAddressTest, create_connection_cancel_fail) { 
  test_hci_layer_->SetCommandFuture();

  acl_manager_->CreateLeConnection(remote_with_type_);



  // Add device to connect list

  test_hci_layer_->GetLastCommandPacket(OpCode::LE_ADD_DEVICE_TO_CONNECT_LIST);

  test_hci_layer_->SetCommandFuture();

  test_hci_layer_->IncomingEvent(LeAddDeviceToConnectListCompleteBuilder::Create(0x01, ErrorCode::SUCCESS));



  // Set random address

  test_hci_layer_->GetLastCommandPacket(OpCode::LE_SET_RANDOM_ADDRESS);

  test_hci_layer_->SetCommandFuture();

  test_hci_layer_->IncomingEvent(LeSetRandomAddressCompleteBuilder::Create(0x01, ErrorCode::SUCCESS));



  // Add device to connect list

  test_hci_layer_->GetLastCommandPacket(OpCode::LE_ADD_DEVICE_TO_CONNECT_LIST);

  test_hci_layer_->SetCommandFuture();

  test_hci_layer_->IncomingEvent(LeAddDeviceToConnectListCompleteBuilder::Create(0x01, ErrorCode::SUCCESS));



  // send create connection command

  test_hci_layer_->GetLastCommandPacket(OpCode::LE_CREATE_CONNECTION);

  test_hci_layer_->IncomingEvent(LeCreateConnectionStatusBuilder::Create(ErrorCode::SUCCESS, 0x01));

system/gd/hci/le_address_manager.cc

+11 −12
Original line number Diff line number Diff line
@@ -199,6 +199,11 @@ void LeAddressManager::pause_registered_clients() { 
  }

}



void LeAddressManager::push_command(Command command) {

  pause_registered_clients();

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

}



void LeAddressManager::ack_pause(LeAddressManagerCallback* callback) {

  ASSERT(registered_clients_.find(callback) != registered_clients_.end());

  registered_clients_.find(callback)->second = ClientState::PAUSED;
@@ -364,8 +369,7 @@ void LeAddressManager::AddDeviceToConnectList( 
    ConnectListAddressType connect_list_address_type, bluetooth::hci::Address address) {

  auto packet_builder = hci::LeAddDeviceToConnectListBuilder::Create(connect_list_address_type, address);

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

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

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

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

}



void LeAddressManager::AddDeviceToResolvingList(
@@ -376,16 +380,14 @@ void LeAddressManager::AddDeviceToResolvingList( 
  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::pause_registered_clients).Invoke();

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

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

}



void LeAddressManager::RemoveDeviceFromConnectList(

    ConnectListAddressType connect_list_address_type, bluetooth::hci::Address address) {

  auto packet_builder = hci::LeRemoveDeviceFromConnectListBuilder::Create(connect_list_address_type, address);

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

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

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

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

}



void LeAddressManager::RemoveDeviceFromResolvingList(
@@ -393,22 +395,19 @@ void LeAddressManager::RemoveDeviceFromResolvingList( 
  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::pause_registered_clients).Invoke();

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

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

}



void LeAddressManager::ClearConnectList() {

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

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

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

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

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

}



void LeAddressManager::ClearResolvingList() {

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

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

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

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

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

}



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

system/gd/hci/le_address_manager.h

+16 −15
Original line number Diff line number Diff line
@@ -88,21 +88,6 @@ class LeAddressManager { 
  void OnCommandComplete(CommandCompleteView view);



 private:

  void pause_registered_clients();

  void ack_pause(LeAddressManagerCallback* callback);

  void resume_registered_clients();

  void ack_resume(LeAddressManagerCallback* callback);

  void register_client(LeAddressManagerCallback* callback);

  void unregister_client(LeAddressManagerCallback* callback);

  void prepare_to_rotate();

  void rotate_random_address();

  void schedule_rotate_random_address();

  void set_random_address();

  hci::Address generate_rpa();

  hci::Address generate_nrpa();

  std::chrono::milliseconds get_next_private_address_interval_ms();

  void handle_next_command();



  enum ClientState {

    WAITING_FOR_PAUSE,

    PAUSED,
@@ -125,6 +110,22 @@ class LeAddressManager { 
    std::unique_ptr<CommandPacketBuilder> command_packet;

  };



  void pause_registered_clients();

  void push_command(Command command);

  void ack_pause(LeAddressManagerCallback* callback);

  void resume_registered_clients();

  void ack_resume(LeAddressManagerCallback* callback);

  void register_client(LeAddressManagerCallback* callback);

  void unregister_client(LeAddressManagerCallback* callback);

  void prepare_to_rotate();

  void rotate_random_address();

  void schedule_rotate_random_address();

  void set_random_address();

  hci::Address generate_rpa();

  hci::Address generate_nrpa();

  std::chrono::milliseconds get_next_private_address_interval_ms();

  void handle_next_command();



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

  os::Handler* handler_;

  std::map<LeAddressManagerCallback*, ClientState> registered_clients_;

system/gd/hci/le_address_manager_test.cc

+9 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ class TestHciLayer : public HciLayer { 
  void EnqueueCommand(

      std::unique_ptr<CommandPacketBuilder> command,

      common::ContextualOnceCallback<void(CommandCompleteView)> on_complete) override {

    std::lock_guard<std::mutex> lock(mutex_);

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

    command_complete_callbacks.push_front(std::move(on_complete));

    if (command_promise_ != nullptr) {
@@ -70,13 +71,17 @@ class TestHciLayer : public HciLayer { 
  }



  CommandPacketView GetCommandPacket(OpCode op_code) {

    if (!command_queue_.empty() && command_future_ != nullptr) {

      command_promise_.reset();

    if (!command_queue_.empty()) {

      std::lock_guard<std::mutex> lock(mutex_);

      if (command_future_ != nullptr) {

        command_future_.reset();

        command_promise_.reset();

      }

    } else if (command_future_ != nullptr) {

      auto result = command_future_->wait_for(std::chrono::milliseconds(1000));

      EXPECT_NE(std::future_status::timeout, result);

    }

    std::lock_guard<std::mutex> lock(mutex_);

    ASSERT_LOG(

        !command_queue_.empty(), "Expecting command %s but command queue was empty", OpCodeText(op_code).c_str());

    CommandPacketView command_packet_view = GetLastCommand();
@@ -108,6 +113,7 @@ class TestHciLayer : public HciLayer { 
  std::queue<std::unique_ptr<CommandPacketBuilder>> command_queue_;

  std::unique_ptr<std::promise<void>> command_promise_;

  std::unique_ptr<std::future<void>> command_future_;

  mutable std::mutex mutex_;

};



class RotatorClient : public LeAddressManagerCallback {

system/gd/hci/le_advertising_manager.cc

+52 −8
Original line number Diff line number Diff line
@@ -270,14 +270,16 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
        le_advertising_interface_->EnqueueCommand(

            hci::LeMultiAdvtSetRandomAddrBuilder::Create(advertising_sets_[id].current_address.GetAddress(), id),

            module_handler_->BindOnce(impl::check_status<LeMultiAdvtCompleteView>));

        EnabledSet curr_set;

        curr_set.advertising_handle_ = id;

        enabled_sets_[id] = curr_set;

        if (!paused) {

          std::vector<EnabledSet> enabled_sets = {curr_set};

          le_advertising_interface_->EnqueueCommand(

              hci::LeMultiAdvtSetEnableBuilder::Create(Enable::ENABLED, id),

              module_handler_->BindOnce(impl::check_status<LeMultiAdvtCompleteView>));

              module_handler_->BindOnceOn(

                  this, &impl::on_set_advertising_enable_complete<LeMultiAdvtCompleteView>, true, enabled_sets));

        }

        EnabledSet curr_set;

        curr_set.advertising_handle_ = id;

        enabled_sets_[id] = curr_set;

      } break;

      case (AdvertisingApiType::EXTENDED): {

        LOG_WARN("Unexpected AdvertisingApiType EXTENDED");
@@ -468,7 +470,19 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
                this, &impl::check_status_with_id<LeSetAdvertisingParametersCompleteView>, advertiser_id));

      } break;

      case (AdvertisingApiType::ANDROID_HCI): {

        // TODO

        le_advertising_interface_->EnqueueCommand(

            hci::LeMultiAdvtParamBuilder::Create(

                config.interval_min,

                config.interval_max,

                config.advertising_type,

                config.own_address_type,

                config.peer_address_type,

                config.peer_address,

                config.channel_map,

                config.filter_policy,

                advertiser_id,

                config.tx_power),

            module_handler_->BindOnceOn(this, &impl::check_status_with_id<LeMultiAdvtCompleteView>, advertiser_id));

      } break;

      case (AdvertisingApiType::EXTENDED): {

        // sid must be in range 0x00 to 0x0F. Since no controller supports more than
@@ -561,7 +575,15 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
        }

      } break;

      case (AdvertisingApiType::ANDROID_HCI): {

        // TODO

        if (set_scan_rsp) {

          le_advertising_interface_->EnqueueCommand(

              hci::LeMultiAdvtSetScanRespBuilder::Create(data, advertiser_id),

              module_handler_->BindOnceOn(this, &impl::check_status_with_id<LeMultiAdvtCompleteView>, advertiser_id));

        } else {

          le_advertising_interface_->EnqueueCommand(

              hci::LeMultiAdvtSetDataBuilder::Create(data, advertiser_id),

              module_handler_->BindOnceOn(this, &impl::check_status_with_id<LeMultiAdvtCompleteView>, advertiser_id));

        }

      } break;

      case (AdvertisingApiType::EXTENDED): {

        uint16_t data_len = 0;
@@ -661,7 +683,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
    switch (advertising_api_type_) {

      case (AdvertisingApiType::LEGACY): {

        le_advertising_interface_->EnqueueCommand(

            hci::LeSetAdvertisingEnableBuilder::Create(Enable::DISABLED),

            hci::LeSetAdvertisingEnableBuilder::Create(enable_value),

            module_handler_->BindOnceOn(

                this,

                &impl::on_set_advertising_enable_complete<LeSetAdvertisingEnableCompleteView>,
@@ -669,7 +691,10 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
                enabled_sets));

      } break;

      case (AdvertisingApiType::ANDROID_HCI): {

        // TODO

        le_advertising_interface_->EnqueueCommand(

            hci::LeMultiAdvtSetEnableBuilder::Create(enable_value, advertiser_id),

            module_handler_->BindOnceOn(

                this, &impl::on_set_advertising_enable_complete<LeMultiAdvtCompleteView>, enable, enabled_sets));

      } break;

      case (AdvertisingApiType::EXTENDED): {

        le_advertising_interface_->EnqueueCommand(
@@ -994,6 +1019,25 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
      case OpCode::LE_SET_PERIODIC_ADVERTISING_DATA:

        advertising_callbacks_->OnPeriodicAdvertisingDataSet(id, advertising_status);

        break;

      case OpCode::LE_MULTI_ADVT: {

        auto command_view = LeMultiAdvtCompleteView::Create(view);

        ASSERT(command_view.IsValid());

        auto sub_opcode = command_view.GetSubCmd();

        switch (sub_opcode) {

          case SubOcf::SET_PARAM:

            advertising_callbacks_->OnAdvertisingParametersUpdated(

                id, le_physical_channel_tx_power_, advertising_status);

            break;

          case SubOcf::SET_DATA:

            advertising_callbacks_->OnAdvertisingDataSet(id, advertising_status);

            break;

          case SubOcf::SET_SCAN_RESP:

            advertising_callbacks_->OnScanResponseDataSet(id, advertising_status);

            break;

          default:

            LOG_WARN("Unexpected sub event type %s", SubOcfText(command_view.GetSubCmd()).c_str());

        }

      } break;

      default:

        LOG_WARN("Unexpected event type %s", OpCodeText(view.GetCommandOpCode()).c_str());

    }