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

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

Merge "Double check if extended scanning is supported" am: 7c53a2c1 am:... 

Merge "Double check if extended scanning is supported" am: 7c53a2c1 am: 9e401a14 am: fb5e7a20 am: f12c0dd7

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



Change-Id: I31e67e0d3c9846c1e748896508ae0e0e36e61099
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f03a5f29 f12c0dd7

system/gd/hci/le_scanning_manager.cc

+3 −1
Original line number Original line Diff line number Diff line
@@ -221,7 +221,9 @@ struct LeScanningManager::impl : public bluetooth::hci::LeAddressManagerCallback 
    le_address_manager_ = acl_manager->GetLeAddressManager();

    le_address_manager_ = acl_manager->GetLeAddressManager();

    le_scanning_interface_ = hci_layer_->GetLeScanningInterface(

    le_scanning_interface_ = hci_layer_->GetLeScanningInterface(

        module_handler_->BindOn(this, &LeScanningManager::impl::handle_scan_results));

        module_handler_->BindOn(this, &LeScanningManager::impl::handle_scan_results));

    if (controller_->IsSupported(OpCode::LE_SET_EXTENDED_SCAN_PARAMETERS)) {

    /* Check to see if the opcode is supported and C19 (support for extended advertising). */

    if (controller_->IsSupported(OpCode::LE_SET_EXTENDED_SCAN_PARAMETERS) &&

        controller->SupportsBleExtendedAdvertising()) {

      api_type_ = ScanApiType::EXTENDED;

      api_type_ = ScanApiType::EXTENDED;

      interval_ms_ = kDefaultLeExtendedScanInterval;

      interval_ms_ = kDefaultLeExtendedScanInterval;

      window_ms_ = kDefaultLeExtendedScanWindow;

      window_ms_ = kDefaultLeExtendedScanWindow;