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

Commit 0a7e5478 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Gerrit Code Review
Browse files

Merge "Configure scan on resume" into main

parents 9f16e047 ca5b24a4

system/gd/hci/le_scanning_manager.cc

+7 −1
Original line number Diff line number Diff line
@@ -1577,8 +1577,14 @@ struct LeScanningManager::impl : public LeAddressManagerCallback { 
      return;

    }

    paused_ = false;

    if (scan_on_resume_ == true) {

    if (scan_on_resume_) {

      scan_on_resume_ = false;

      if (com::android::bluetooth::flags::configure_scan_on_resume()) {

        // This is a workaround for b/381010390.

        // We'll eventually recover scan parameters which could be overridden by

        // btm_send_hci_set_scan_params.

        configure_scan();

      }

      start_scan();

    }

    le_address_manager_->AckResume(this);

system/gd/hci/le_scanning_manager_test.cc

+5 −0
Original line number Diff line number Diff line
@@ -828,6 +828,11 @@ TEST_F(LeScanningManagerExtendedTest, on_pause_on_resume_test) { 


  // Ensure scan is resumed (enabled)

  test_le_address_manager->client_->OnResume();

  if (com::android::bluetooth::flags::configure_scan_on_resume()) {

    ASSERT_EQ(OpCode::LE_SET_EXTENDED_SCAN_PARAMETERS, test_hci_layer_->GetCommand().GetOpCode());

    test_hci_layer_->IncomingEvent(

            LeSetExtendedScanParametersCompleteBuilder::Create(uint8_t{1}, ErrorCode::SUCCESS));

  }

  ASSERT_EQ(OpCode::LE_SET_EXTENDED_SCAN_ENABLE, test_hci_layer_->GetCommand().GetOpCode());

  test_hci_layer_->IncomingEvent(

          LeSetExtendedScanEnableCompleteBuilder::Create(uint8_t{1}, ErrorCode::SUCCESS));