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

Commit 1a4672d1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6045210 from 8267fd69 to rvc-release 

Change-Id: Ib6f2361989931cff9c20658ecd528135fe6e1852
parents 47d789dd 8267fd69

system/gd/hci/acl_manager_test.cc

+55 −8
Original line number Diff line number Diff line
@@ -102,14 +102,26 @@ class TestHciLayer : public HciLayer { 
                      common::OnceCallback<void(CommandStatusView)> on_status, os::Handler* handler) override {

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

    command_status_callbacks.push_front(std::move(on_status));

    not_empty_.notify_all();

    if (command_promise_ != nullptr) {

      command_promise_->set_value();

      command_promise_.reset();

    }

  }



  void EnqueueCommand(std::unique_ptr<CommandPacketBuilder> command,

                      common::OnceCallback<void(CommandCompleteView)> on_complete, os::Handler* handler) override {

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

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

    not_empty_.notify_all();

    if (command_promise_ != nullptr) {

      command_promise_->set_value();

      command_promise_.reset();

    }

  }



  void SetCommandFuture() {

    ASSERT_LOG(command_promise_ == nullptr, "Promises, Promises, ... Only one at a time.");

    command_promise_ = std::make_unique<std::promise<void>>();

    command_future_ = std::make_unique<std::future<void>>(command_promise_->get_future());

  }



  std::unique_ptr<CommandPacketBuilder> GetLastCommand() {
@@ -122,10 +134,11 @@ class TestHciLayer : public HciLayer { 
  }



  ConnectionManagementCommandView GetCommandPacket(OpCode op_code) {

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

    std::chrono::milliseconds time = std::chrono::milliseconds(3000);



    ASSERT(not_empty_.wait_for(lock, time) != std::cv_status::timeout);

    if (command_future_ != nullptr) {

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

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

    }

    ASSERT(command_queue_.size() > 0);

    auto packet_view = GetPacketView(GetLastCommand());

    CommandPacketView command_packet_view = CommandPacketView::Create(packet_view);

    ConnectionManagementCommandView command = ConnectionManagementCommandView::Create(command_packet_view);
@@ -241,8 +254,8 @@ class TestHciLayer : public HciLayer { 
  BidiQueue<AclPacketView, AclPacketBuilder> acl_queue_{3 /* TODO: Set queue depth */};



  std::queue<std::unique_ptr<CommandPacketBuilder>> command_queue_;

  mutable std::mutex mutex_;

  std::condition_variable not_empty_;

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

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

};



class AclManagerNoCallbacksTest : public ::testing::Test {
@@ -435,6 +448,7 @@ TEST_F(AclManagerNoCallbacksTest, acl_connection_before_registered_callbacks) { 
TEST_F(AclManagerTest, invoke_registered_callback_connection_complete_success) {

  uint16_t handle = 1;



  test_hci_layer_->SetCommandFuture();

  acl_manager_->CreateConnection(remote);



  // Wait for the connection request
@@ -458,6 +472,7 @@ TEST_F(AclManagerTest, invoke_registered_callback_connection_complete_success) { 
TEST_F(AclManagerTest, invoke_registered_callback_connection_complete_fail) {

  uint16_t handle = 0x123;



  test_hci_layer_->SetCommandFuture();

  acl_manager_->CreateConnection(remote);



  // Wait for the connection request
@@ -476,6 +491,7 @@ TEST_F(AclManagerTest, invoke_registered_callback_connection_complete_fail) { 


TEST_F(AclManagerTest, invoke_registered_callback_le_connection_complete_success) {

  AddressWithType remote_with_type(remote, AddressType::PUBLIC_DEVICE_ADDRESS);

  test_hci_layer_->SetCommandFuture();

  acl_manager_->CreateLeConnection(remote_with_type);



  auto packet = test_hci_layer_->GetCommandPacket(OpCode::LE_CREATE_CONNECTION);
@@ -502,6 +518,7 @@ TEST_F(AclManagerTest, invoke_registered_callback_le_connection_complete_success 


TEST_F(AclManagerTest, invoke_registered_callback_le_connection_complete_fail) {

  AddressWithType remote_with_type(remote, AddressType::PUBLIC_DEVICE_ADDRESS);

  test_hci_layer_->SetCommandFuture();

  acl_manager_->CreateLeConnection(remote_with_type);



  auto packet = test_hci_layer_->GetCommandPacket(OpCode::LE_CREATE_CONNECTION);
@@ -523,6 +540,7 @@ TEST_F(AclManagerTest, invoke_registered_callback_le_connection_complete_fail) { 
TEST_F(AclManagerTest, invoke_registered_callback_disconnection_complete) {

  uint16_t handle = 0x123;



  test_hci_layer_->SetCommandFuture();

  acl_manager_->CreateConnection(remote);



  // Wait for the connection request
@@ -562,6 +580,7 @@ TEST_F(AclManagerTest, invoke_registered_callback_disconnection_complete) { 
TEST_F(AclManagerTest, acl_connection_finish_after_disconnected) {

  uint16_t handle = 0x123;



  test_hci_layer_->SetCommandFuture();

  acl_manager_->CreateConnection(remote);



  // Wait for the connection request
@@ -693,6 +712,7 @@ TEST_F(AclManagerTest, acl_send_data_credits) { 
}



TEST_F(AclManagerWithConnectionTest, send_switch_role) {

  test_hci_layer_->SetCommandFuture();

  acl_manager_->SwitchRole(connection_->GetAddress(), Role::SLAVE);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::SWITCH_ROLE);

  auto command_view = SwitchRoleView::Create(packet);
@@ -705,11 +725,13 @@ TEST_F(AclManagerWithConnectionTest, send_switch_role) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_default_link_policy_settings) {

  test_hci_layer_->SetCommandFuture();

  acl_manager_->ReadDefaultLinkPolicySettings();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_DEFAULT_LINK_POLICY_SETTINGS);

  auto command_view = ReadDefaultLinkPolicySettingsView::Create(packet);

  ASSERT(command_view.IsValid());



  test_hci_layer_->SetCommandFuture();

  EXPECT_CALL(mock_acl_manager_callbacks_, OnReadDefaultLinkPolicySettingsComplete(0x07));

  uint8_t num_packets = 1;

  test_hci_layer_->IncomingEvent(
@@ -717,6 +739,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_default_link_policy_settings) { 
}



TEST_F(AclManagerWithConnectionTest, send_write_default_link_policy_settings) {

  test_hci_layer_->SetCommandFuture();

  acl_manager_->WriteDefaultLinkPolicySettings(0x05);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::WRITE_DEFAULT_LINK_POLICY_SETTINGS);

  auto command_view = WriteDefaultLinkPolicySettingsView::Create(packet);
@@ -729,6 +752,7 @@ TEST_F(AclManagerWithConnectionTest, send_write_default_link_policy_settings) { 
}



TEST_F(AclManagerWithConnectionTest, send_change_connection_packet_type) {

  test_hci_layer_->SetCommandFuture();

  connection_->ChangeConnectionPacketType(0xEE1C);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::CHANGE_CONNECTION_PACKET_TYPE);

  auto command_view = ChangeConnectionPacketTypeView::Create(packet);
@@ -740,6 +764,7 @@ TEST_F(AclManagerWithConnectionTest, send_change_connection_packet_type) { 
}



TEST_F(AclManagerWithConnectionTest, send_authentication_requested) {

  test_hci_layer_->SetCommandFuture();

  connection_->AuthenticationRequested();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::AUTHENTICATION_REQUESTED);

  auto command_view = AuthenticationRequestedView::Create(packet);
@@ -750,6 +775,7 @@ TEST_F(AclManagerWithConnectionTest, send_authentication_requested) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_clock_offset) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadClockOffset();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_CLOCK_OFFSET);

  auto command_view = ReadClockOffsetView::Create(packet);
@@ -760,6 +786,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_clock_offset) { 
}



TEST_F(AclManagerWithConnectionTest, send_hold_mode) {

  test_hci_layer_->SetCommandFuture();

  connection_->HoldMode(0x0500, 0x0020);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::HOLD_MODE);

  auto command_view = HoldModeView::Create(packet);
@@ -772,6 +799,7 @@ TEST_F(AclManagerWithConnectionTest, send_hold_mode) { 
}



TEST_F(AclManagerWithConnectionTest, send_sniff_mode) {

  test_hci_layer_->SetCommandFuture();

  connection_->SniffMode(0x0500, 0x0020, 0x0040, 0x0014);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::SNIFF_MODE);

  auto command_view = SniffModeView::Create(packet);
@@ -786,6 +814,7 @@ TEST_F(AclManagerWithConnectionTest, send_sniff_mode) { 
}



TEST_F(AclManagerWithConnectionTest, send_exit_sniff_mode) {

  test_hci_layer_->SetCommandFuture();

  connection_->ExitSniffMode();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::EXIT_SNIFF_MODE);

  auto command_view = ExitSniffModeView::Create(packet);
@@ -796,6 +825,7 @@ TEST_F(AclManagerWithConnectionTest, send_exit_sniff_mode) { 
}



TEST_F(AclManagerWithConnectionTest, send_qos_setup) {

  test_hci_layer_->SetCommandFuture();

  connection_->QosSetup(ServiceType::BEST_EFFORT, 0x1234, 0x1233, 0x1232, 0x1231);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::QOS_SETUP);

  auto command_view = QosSetupView::Create(packet);
@@ -813,6 +843,7 @@ TEST_F(AclManagerWithConnectionTest, send_qos_setup) { 
}



TEST_F(AclManagerWithConnectionTest, send_flow_specification) {

  test_hci_layer_->SetCommandFuture();

  connection_->FlowSpecification(FlowDirection::OUTGOING_FLOW, ServiceType::BEST_EFFORT, 0x1234, 0x1233, 0x1232,

                                 0x1231);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::FLOW_SPECIFICATION);
@@ -834,6 +865,7 @@ TEST_F(AclManagerWithConnectionTest, send_flow_specification) { 
}



TEST_F(AclManagerWithConnectionTest, send_flush) {

  test_hci_layer_->SetCommandFuture();

  connection_->Flush();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::FLUSH);

  auto command_view = FlushView::Create(packet);
@@ -844,6 +876,7 @@ TEST_F(AclManagerWithConnectionTest, send_flush) { 
}



TEST_F(AclManagerWithConnectionTest, send_role_discovery) {

  test_hci_layer_->SetCommandFuture();

  connection_->RoleDiscovery();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::ROLE_DISCOVERY);

  auto command_view = RoleDiscoveryView::Create(packet);
@@ -856,6 +889,7 @@ TEST_F(AclManagerWithConnectionTest, send_role_discovery) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_link_policy_settings) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadLinkPolicySettings();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_LINK_POLICY_SETTINGS);

  auto command_view = ReadLinkPolicySettingsView::Create(packet);
@@ -868,6 +902,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_link_policy_settings) { 
}



TEST_F(AclManagerWithConnectionTest, send_write_link_policy_settings) {

  test_hci_layer_->SetCommandFuture();

  connection_->WriteLinkPolicySettings(0x05);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::WRITE_LINK_POLICY_SETTINGS);

  auto command_view = WriteLinkPolicySettingsView::Create(packet);
@@ -880,6 +915,7 @@ TEST_F(AclManagerWithConnectionTest, send_write_link_policy_settings) { 
}



TEST_F(AclManagerWithConnectionTest, send_sniff_subrating) {

  test_hci_layer_->SetCommandFuture();

  connection_->SniffSubrating(0x1234, 0x1235, 0x1236);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::SNIFF_SUBRATING);

  auto command_view = SniffSubratingView::Create(packet);
@@ -893,6 +929,7 @@ TEST_F(AclManagerWithConnectionTest, send_sniff_subrating) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_automatic_flush_timeout) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadAutomaticFlushTimeout();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_AUTOMATIC_FLUSH_TIMEOUT);

  auto command_view = ReadAutomaticFlushTimeoutView::Create(packet);
@@ -905,6 +942,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_automatic_flush_timeout) { 
}



TEST_F(AclManagerWithConnectionTest, send_write_automatic_flush_timeout) {

  test_hci_layer_->SetCommandFuture();

  connection_->WriteAutomaticFlushTimeout(0x07FF);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::WRITE_AUTOMATIC_FLUSH_TIMEOUT);

  auto command_view = WriteAutomaticFlushTimeoutView::Create(packet);
@@ -917,6 +955,7 @@ TEST_F(AclManagerWithConnectionTest, send_write_automatic_flush_timeout) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_transmit_power_level) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadTransmitPowerLevel(TransmitPowerLevelType::CURRENT);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_TRANSMIT_POWER_LEVEL);

  auto command_view = ReadTransmitPowerLevelView::Create(packet);
@@ -930,6 +969,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_transmit_power_level) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_link_supervision_timeout) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadLinkSupervisionTimeout();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_LINK_SUPERVISION_TIMEOUT);

  auto command_view = ReadLinkSupervisionTimeoutView::Create(packet);
@@ -942,6 +982,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_link_supervision_timeout) { 
}



TEST_F(AclManagerWithConnectionTest, send_write_link_supervision_timeout) {

  test_hci_layer_->SetCommandFuture();

  connection_->WriteLinkSupervisionTimeout(0x5678);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::WRITE_LINK_SUPERVISION_TIMEOUT);

  auto command_view = WriteLinkSupervisionTimeoutView::Create(packet);
@@ -954,6 +995,7 @@ TEST_F(AclManagerWithConnectionTest, send_write_link_supervision_timeout) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_failed_contact_counter) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadFailedContactCounter();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_FAILED_CONTACT_COUNTER);

  auto command_view = ReadFailedContactCounterView::Create(packet);
@@ -966,6 +1008,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_failed_contact_counter) { 
}



TEST_F(AclManagerWithConnectionTest, send_reset_failed_contact_counter) {

  test_hci_layer_->SetCommandFuture();

  connection_->ResetFailedContactCounter();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::RESET_FAILED_CONTACT_COUNTER);

  auto command_view = ResetFailedContactCounterView::Create(packet);
@@ -977,6 +1020,7 @@ TEST_F(AclManagerWithConnectionTest, send_reset_failed_contact_counter) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_link_quality) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadLinkQuality();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_LINK_QUALITY);

  auto command_view = ReadLinkQualityView::Create(packet);
@@ -989,6 +1033,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_link_quality) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_afh_channel_map) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadAfhChannelMap();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_AFH_CHANNEL_MAP);

  auto command_view = ReadAfhChannelMapView::Create(packet);
@@ -1003,6 +1048,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_afh_channel_map) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_rssi) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadRssi();

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_RSSI);

  auto command_view = ReadRssiView::Create(packet);
@@ -1014,6 +1060,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_rssi) { 
}



TEST_F(AclManagerWithConnectionTest, send_read_clock) {

  test_hci_layer_->SetCommandFuture();

  connection_->ReadClock(WhichClock::LOCAL);

  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_CLOCK);

  auto command_view = ReadClockView::Create(packet);

system/gd/hci/controller.cc

+2 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ struct Controller::impl { 
      OP_CODE_MAPPING(LE_READ_SUGGESTED_DEFAULT_DATA_LENGTH)

      OP_CODE_MAPPING(LE_WRITE_SUGGESTED_DEFAULT_DATA_LENGTH)

      OP_CODE_MAPPING(LE_READ_LOCAL_P_256_PUBLIC_KEY_COMMAND)

      OP_CODE_MAPPING(LE_GENERATE_DHKEY_COMMAND)

      OP_CODE_MAPPING(LE_GENERATE_DHKEY_COMMAND_V1)

      OP_CODE_MAPPING(LE_ADD_DEVICE_TO_RESOLVING_LIST)

      OP_CODE_MAPPING(LE_REMOVE_DEVICE_FROM_RESOLVING_LIST)

      OP_CODE_MAPPING(LE_CLEAR_RESOLVING_LIST)
@@ -631,6 +631,7 @@ struct Controller::impl { 
      OP_CODE_MAPPING(LE_READ_RF_PATH_COMPENSATION_POWER)

      OP_CODE_MAPPING(LE_WRITE_RF_PATH_COMPENSATION_POWER)

      OP_CODE_MAPPING(LE_SET_PRIVACY_MODE)

      OP_CODE_MAPPING(LE_GENERATE_DHKEY_COMMAND)

      // vendor specific

      case OpCode::LE_GET_VENDOR_CAPABILITIES:

        return vendor_capabilities_.is_supported_ == 0x01;

system/gd/hci/hci_packets.pdl

+175 −32

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/hci/le_scanning_manager.cc

+6 −3
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
namespace bluetooth {

namespace hci {



constexpr uint16_t kDefaultLeScanWindow = 4800;

constexpr uint16_t kDefaultLeScanInterval = 4800;



const ModuleFactory LeScanningManager::Factory = ModuleFactory([]() { return new LeScanningManager(); });



enum class ScanApiType {
@@ -109,8 +112,8 @@ struct LeScanningManager::impl { 
  void configure_scan() {

    std::vector<PhyScanParameters> parameter_vector;

    PhyScanParameters phy_scan_parameters;

    phy_scan_parameters.le_scan_window_ = 0;

    phy_scan_parameters.le_scan_interval_ = 0;

    phy_scan_parameters.le_scan_window_ = kDefaultLeScanWindow;

    phy_scan_parameters.le_scan_interval_ = kDefaultLeScanInterval;

    phy_scan_parameters.le_scan_type_ = LeScanType::ACTIVE;

    parameter_vector.push_back(phy_scan_parameters);

    uint8_t phys_in_use = 1;

system/gd/l2cap/classic/cert/cert.cc

+14 −4
Original line number Diff line number Diff line
@@ -164,10 +164,10 @@ class L2capClassicModuleCertService : public L2capClassicModuleCert::Service { 
    if (request->retransmission_config().mode() == ChannelRetransmissionFlowControlMode::ERTM) {

      auto option = std::make_unique<RetransmissionAndFlowControlConfigurationOption>();

      option->mode_ = RetransmissionAndFlowControlModeOption::ENHANCED_RETRANSMISSION;

      option->tx_window_size_ = 10;

      option->max_transmit_ = 20;

      option->retransmission_time_out_ = 2000;

      option->monitor_time_out_ = 12000;

      option->tx_window_size_ = 5;

      option->max_transmit_ = 1;

      option->retransmission_time_out_ = 1000;

      option->monitor_time_out_ = 2000;

      option->maximum_pdu_size_ = 1010;

      config.push_back(std::move(option));

    }
@@ -407,6 +407,16 @@ class L2capClassicModuleCertService : public L2capClassicModuleCert::Service { 
        LogEvent(response);

        break;

      }

      case CommandCode::DISCONNECTION_REQUEST: {

        DisconnectionRequestView view = DisconnectionRequestView::Create(control_view);

        ASSERT(view.IsValid());

        FetchL2capLogResponse response;

        response.mutable_disconnection_request()->set_signal_id(control_view.GetIdentifier());

        response.mutable_disconnection_request()->set_dcid(view.GetDestinationCid());

        response.mutable_disconnection_request()->set_scid(view.GetSourceCid());

        LogEvent(response);

        break;

      }

      case CommandCode::DISCONNECTION_RESPONSE: {

        DisconnectionResponseView view = DisconnectionResponseView::Create(control_view);

        ASSERT(view.IsValid());