commit 8b3e3ed3d9f9bc12c3ffeb380ca68ed3b5852ef6
author Jakub Pawlowski <jpawlowski@google.com> Tue Jan 12 22:58:03 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 12 22:58:03 2016 +0000
tree 6a3d40d2c281703d4c60843c5d9298e06a30af53
parent 7632bee5a5a5ee501efe188f36a05dd830842072
parent d748ef2bcc24747659dadec242fd5a7a0c8ba3c4

Merge "service: Rename variable holding advertisement settings"

service/ipc/binder/bluetooth_low_energy_binder_server.cpp

diff --git a/service/ipc/binder/bluetooth_low_energy_binder_server.cpp b/service/ipc/binder/bluetooth_low_energy_binder_server.cpp
index 9dca2de..5322109 100644
--- a/service/ipc/binder/bluetooth_low_energy_binder_server.cpp
+++ b/service/ipc/binder/bluetooth_low_energy_binder_server.cpp
@@ -112,7 +112,7 @@
   // Create a weak pointer and pass that to the callback to prevent a potential
   // use after free.
   android::wp<BluetoothLowEnergyBinderServer> weak_ptr_to_this(this);
-  auto settings_copy = client->settings();
+  auto settings_copy = client->advertise_settings();
   auto callback = [=](bluetooth::BLEStatus status) {
     auto sp_to_this = weak_ptr_to_this.promote();
     if (!sp_to_this.get()) {

service/low_energy_client.cpp

diff --git a/service/low_energy_client.cpp b/service/low_energy_client.cpp
index ec9181f..e8bb16d 100644
--- a/service/low_energy_client.cpp
+++ b/service/low_energy_client.cpp
@@ -327,7 +327,7 @@
 
   adv_data_ = advertise_data;
   scan_response_ = scan_response;
-  settings_ = settings;
+  advertise_settings_ = settings;
 
   AdvertiseParams params;
   GetAdvertiseParams(settings, !scan_response_.data().empty(), &params);

service/low_energy_client.h

diff --git a/service/low_energy_client.h b/service/low_energy_client.h
index fd14e64..d75392f 100644
--- a/service/low_energy_client.h
+++ b/service/low_energy_client.h
@@ -65,7 +65,9 @@
   bool IsStoppingAdvertising() const;
 
   // Returns the current advertising settings.
-  const AdvertiseSettings& settings() const { return settings_; }
+  const AdvertiseSettings& advertise_settings() const {
+   return advertise_settings_;
+  }
 
   // BluetoothClientInstace overrides:
   const UUID& GetAppIdentifier() const override;
@@ -119,7 +121,7 @@
   std::atomic_bool scan_rsp_needs_update_;
 
   // Latest advertising settings.
-  AdvertiseSettings settings_;
+  AdvertiseSettings advertise_settings_;
 
   // Whether or not there is a pending call to update advertising or scan
   // response data.