commit f8ff41263588291d0de9208ad0d5512bd054eb90
author Arman Uguray <armansito@google.com> Sun Sep 20 12:26:16 2015 -0700
committer Arman Uguray <armansito@google.com> Sun Sep 20 12:26:16 2015 -0700
tree 56232570a5c1ea50acf672ae1fd4c20e9529390a
parent cbe2bc0c8bab9700cef5ebf2cbea05680f73d0f2

service: Fix build breakage.

Fixed build breakage due to missing changes.

Change-Id: Iac962fef2e9be979a2af90a43a66a5c66bbe4ad4

system/service/low_energy_client.cpp

diff --git a/system/service/low_energy_client.cpp b/system/service/low_energy_client.cpp
index fb473e1..16029a0 100644
--- a/system/service/low_energy_client.cpp
+++ b/system/service/low_energy_client.cpp
@@ -67,6 +67,7 @@
 }
 
 void LowEnergyClientFactory::RegisterClientCallback(
+    hal::BluetoothGattInterface* /* gatt_iface */,
     int status, int client_if,
     const bt_uuid_t& app_uuid) {
   UUID uuid(app_uuid);

system/service/low_energy_client.h

diff --git a/system/service/low_energy_client.h b/system/service/low_energy_client.h
index 65ec934..be938df 100644
--- a/system/service/low_energy_client.h
+++ b/system/service/low_energy_client.h
@@ -81,8 +81,10 @@
 
  private:
   // BluetoothGattInterface::ClientObserver overrides:
-  void RegisterClientCallback(int status, int client_if,
-                              const bt_uuid_t& app_uuid) override;
+  void RegisterClientCallback(
+      hal::BluetoothGattInterface* gatt_iface,
+      int status, int client_if,
+      const bt_uuid_t& app_uuid) override;
 
   // Map of pending calls to register.
   std::mutex pending_calls_lock_;

system/service/test/low_energy_client_unittest.cpp

diff --git a/system/service/test/low_energy_client_unittest.cpp b/system/service/test/low_energy_client_unittest.cpp
index 3261f02..9ee24ae 100644
--- a/system/service/test/low_energy_client_unittest.cpp
+++ b/system/service/test/low_energy_client_unittest.cpp
@@ -34,6 +34,24 @@
 
   MOCK_METHOD1(RegisterClient, bt_status_t(bt_uuid_t*));
   MOCK_METHOD1(UnregisterClient, bt_status_t(int));
+  MOCK_METHOD7(MultiAdvEnable, bt_status_t(int, int, int, int, int, int, int));
+  MOCK_METHOD10(MultiAdvSetInstDataMock,
+                bt_status_t(bool, bool, bool, int,
+                            int, char*, int, char*, int, char*));
+  MOCK_METHOD1(MultiAdvDisable, bt_status_t(int));
+
+  bt_status_t MultiAdvSetInstData(
+      int client_if, bool set_scan_rsp, bool include_name,
+      bool incl_txpower, int appearance,
+      int manufacturer_len, char* manufacturer_data,
+      int service_data_len, char* service_data,
+      int service_uuid_len, char* service_uuid) override {
+    return MultiAdvSetInstDataMock(
+        set_scan_rsp, include_name, incl_txpower, appearance,
+        manufacturer_len, manufacturer_data,
+        service_data_len, service_data,
+        service_uuid_len, service_uuid);
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockGattHandler);