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

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

Merge "GD Scanning: Always disable scan before set parameter"

parents bd672045 2d368fe8

system/gd/hci/le_scanning_manager.cc

+3 −0
Original line number Diff line number Diff line
@@ -381,6 +381,9 @@ struct LeScanningManager::impl : public bluetooth::hci::LeAddressManagerCallback 
    parameter_vector.push_back(phy_scan_parameters);

    uint8_t phys_in_use = 1;



    // The Host shall not issue set scan parameter command when scanning is enabled

    stop_scan();



    if (le_address_manager_->GetAddressPolicy() != LeAddressManager::USE_PUBLIC_ADDRESS) {

      own_address_type_ = OwnAddressType::RANDOM_DEVICE_ADDRESS;

    }

system/gd/hci/le_scanning_manager_test.cc

+11 −0
Original line number Diff line number Diff line
@@ -246,6 +246,10 @@ class LeScanningManagerTest : public ::testing::Test { 
        static_cast<LeScanningManager*>(fake_registry_.GetModuleUnderTest(&LeScanningManager::Factory));

    auto result = config_future.wait_for(std::chrono::duration(std::chrono::milliseconds(1000)));

    ASSERT_EQ(std::future_status::ready, result);

    auto packet = test_hci_layer_->GetCommand(enable_opcode_);

    test_hci_layer_->IncomingEvent(LeSetScanEnableCompleteBuilder::Create(1, ErrorCode::SUCCESS));

    config_future.wait_for(std::chrono::duration(std::chrono::milliseconds(1000)));

    ASSERT_EQ(std::future_status::ready, result);

    HandleConfiguration();

    le_scanning_manager->RegisterScanningCallback(&mock_callbacks_);

  }
@@ -314,6 +318,7 @@ class LeScanningManagerTest : public ::testing::Test { 
  } mock_callbacks_;



  OpCode param_opcode_{OpCode::LE_SET_ADVERTISING_PARAMETERS};

  OpCode enable_opcode_{OpCode::LE_SET_SCAN_ENABLE};

  bool is_filter_support_ = false;

};
@@ -336,6 +341,7 @@ class LeExtendedScanningManagerTest : public LeScanningManagerTest { 
 protected:

  void SetUp() override {

    param_opcode_ = OpCode::LE_SET_EXTENDED_SCAN_PARAMETERS;

    enable_opcode_ = OpCode::LE_SET_EXTENDED_SCAN_ENABLE;

    LeScanningManagerTest::SetUp();

  }
@@ -446,6 +452,11 @@ TEST_F(LeExtendedScanningManagerTest, start_scan_test) { 


  auto result = next_command_future.wait_for(std::chrono::duration(std::chrono::milliseconds(100)));

  ASSERT_EQ(std::future_status::ready, result);

  test_hci_layer_->GetCommand(OpCode::LE_SET_EXTENDED_SCAN_ENABLE);

  test_hci_layer_->IncomingEvent(LeSetScanEnableCompleteBuilder::Create(uint8_t{1}, ErrorCode::SUCCESS));



  result = next_command_future.wait_for(std::chrono::duration(std::chrono::milliseconds(100)));

  ASSERT_EQ(std::future_status::ready, result);

  test_hci_layer_->GetCommand(OpCode::LE_SET_EXTENDED_SCAN_PARAMETERS);

  test_hci_layer_->IncomingEvent(LeSetExtendedScanParametersCompleteBuilder::Create(uint8_t{1}, ErrorCode::SUCCESS));