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

Commit ed852333 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge "Double check if extended scanning is supported" into tm-dev am: 442c0b25 

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



Change-Id: I587ece89a80e8dfc3e3b43eb92e4cbe699b6632b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d383468 442c0b25

system/gd/hci/le_scanning_manager.cc

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

    le_scanning_interface_ = hci_layer_->GetLeScanningInterface(

        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;

      interval_ms_ = kDefaultLeExtendedScanInterval;

      window_ms_ = kDefaultLeExtendedScanWindow;