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

Commit 48c34f7e authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "HCI: Change CreateAdvertiser overload to ExtendedCreateAdvertiser" am:... 

Merge "HCI: Change CreateAdvertiser overload to ExtendedCreateAdvertiser" am: 1ef04b42 am: d9707395
am: da7f535e

Change-Id: Ie4eb7a4f6d1c8eb833fc72057bf2d941e7a9c3bf
parents a0695680 da7f535e

system/gd/hci/le_advertising_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ AdvertiserId LeAdvertisingManager::CreateAdvertiser( 
  return id;

}



AdvertiserId LeAdvertisingManager::CreateAdvertiser(

AdvertiserId LeAdvertisingManager::ExtendedCreateAdvertiser(

    const ExtendedAdvertisingConfig& config, const common::Callback<void(Address, AddressType)>& scan_callback,

    const common::Callback<void(ErrorCode, uint8_t, uint8_t)>& set_terminated_callback, os::Handler* handler) {

  if (config.directed) {

system/gd/hci/le_advertising_manager.h

+3 −4
Original line number Diff line number Diff line
@@ -69,10 +69,9 @@ class LeAdvertisingManager : public bluetooth::Module { 
                                const common::Callback<void(Address, AddressType)>& scan_callback,

                                const common::Callback<void(ErrorCode, uint8_t, uint8_t)>& set_terminated_callback,

                                os::Handler* handler);

  AdvertiserId CreateAdvertiser(const ExtendedAdvertisingConfig& config,

                                const common::Callback<void(Address, AddressType)>& scan_callback,

                                const common::Callback<void(ErrorCode, uint8_t, uint8_t)>& set_terminated_callback,

                                os::Handler* handler);

  AdvertiserId ExtendedCreateAdvertiser(

      const ExtendedAdvertisingConfig& config, const common::Callback<void(Address, AddressType)>& scan_callback,

      const common::Callback<void(ErrorCode, uint8_t, uint8_t)>& set_terminated_callback, os::Handler* handler);



  void RemoveAdvertiser(AdvertiserId id);