commit ec1fb6b15536ed30b00df43b98105d073102e6bc
author Jack He <siyuanh@google.com> Wed Nov 27 15:01:55 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 27 15:01:55 2019 -0800
tree b2024d01191c521539a6a345a20426e9ba143609
parent 0df76fad2145475a580285621cae296e8070970a
parent bfd7108443deec2ac78e0ea225c81835c67e4252

Merge "HCI: Change CreateAdvertiser overload to ExtendedCreateAdvertiser" am: 433045b59d
am: bfd7108443

Change-Id: I64f412d0ffda5f0a1cdec15c2e9d687ad59f4eec

gd/hci/le_advertising_manager.cc

diff --git a/gd/hci/le_advertising_manager.cc b/gd/hci/le_advertising_manager.cc
index 3362ea3..3e5aa72 100644
--- a/gd/hci/le_advertising_manager.cc
+++ b/gd/hci/le_advertising_manager.cc
@@ -286,7 +286,7 @@
   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) {

gd/hci/le_advertising_manager.h

diff --git a/gd/hci/le_advertising_manager.h b/gd/hci/le_advertising_manager.h
index 4bbcfc1..25eae3d 100644
--- a/gd/hci/le_advertising_manager.h
+++ b/gd/hci/le_advertising_manager.h
@@ -69,10 +69,9 @@
                                 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);