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

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

Merge changes I8bcc6826,I9b34e64d am: 6f01cd0b am: 2eaba5f8 

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



Change-Id: Ib1cee69e4a6f13253f69fd5aaa9a812e73e11bde
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ecfae43 2eaba5f8

system/gd/hci/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ filegroup { 
        "uuid_unittest.cc",

        "le_periodic_sync_manager_test.cc",

        "le_scanning_manager_test.cc",

        "le_advertising_manager_test.cc",

    ],

}

system/gd/hci/le_address_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class LeAddressManager { 
      crypto_toolbox::Octet16 rotation_irk,

      std::chrono::milliseconds minimum_rotation_time,

      std::chrono::milliseconds maximum_rotation_time);

  AddressPolicy GetAddressPolicy();

  virtual AddressPolicy GetAddressPolicy();

  void AckPause(LeAddressManagerCallback* callback);

  void AckResume(LeAddressManagerCallback* callback);

  virtual AddressPolicy Register(LeAddressManagerCallback* callback);

system/gd/hci/le_advertising_manager.cc

+4 −4
Original line number Diff line number Diff line
@@ -114,10 +114,6 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
    le_advertising_interface_ =

        hci_layer_->GetLeAdvertisingInterface(module_handler_->BindOn(this, &LeAdvertisingManager::impl::handle_event));

    num_instances_ = controller_->GetLeNumberOfSupportedAdverisingSets();

    enabled_sets_ = std::vector<EnabledSet>(num_instances_);

    for (size_t i = 0; i < enabled_sets_.size(); i++) {

      enabled_sets_[i].advertising_handle_ = kInvalidHandle;

    }



    if (controller_->SupportsBleExtendedAdvertising()) {

      advertising_api_type_ = AdvertisingApiType::EXTENDED;
@@ -138,6 +134,10 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
            handler->BindOnceOn(this, &impl::on_read_advertising_physical_channel_tx_power));

      }

    }

    enabled_sets_ = std::vector<EnabledSet>(num_instances_);

    for (size_t i = 0; i < enabled_sets_.size(); i++) {

      enabled_sets_[i].advertising_handle_ = kInvalidHandle;

    }

  }



  size_t GetNumberOfAdvertisingInstances() const {