[Bluetooth] Stop server after unregistering last service

GATTServer has to be stopped in case of last service unregistration.

[ACR] https://code.sec.samsung.net/jira/browse/TWDAPI-263
[TASK] https://code.sec.samsung.net/jira/browse/XWALK-2163

[Verification] Build successful. Tested in Chrome Console.
               Server stops when last service is unregistered.

Change-Id: I756bf9d944937e03f7e808c929e31140f4145add
Signed-off-by: Rafal Walczyna <r.walczyna@samsung.com>

diff --git a/src/bluetooth/bluetooth_gatt_server.cc b/src/bluetooth/bluetooth_gatt_server.cc
index c73e911..d75cb0d 100644 (file)
--- a/src/bluetooth/bluetooth_gatt_server.cc
+++ b/src/bluetooth/bluetooth_gatt_server.cc
@@ -199,6 +199,14 @@ void BluetoothGATTServer::UnregisterService(const picojson::value& args, picojso
     return;
   }
 
+  if (false == service_.IsAnyServiceRegistered()) {
+    // Last service unregistered, stop GATTServer
+    // All native objects should be already freed, so just Deinitialize and notify
+    // JS layer about server's state change
+    Deinitialize();
+    SetRunningState(false);
+  }
+
   ReportSuccess(out);
 }
 

diff --git a/src/bluetooth/bluetooth_gatt_server_service.cc b/src/bluetooth/bluetooth_gatt_server_service.cc
index fe05c02..17488bc 100644 (file)
--- a/src/bluetooth/bluetooth_gatt_server_service.cc
+++ b/src/bluetooth/bluetooth_gatt_server_service.cc
@@ -709,5 +709,10 @@ void BluetoothGATTServerService::ClearGATTData() {
   callback_names_.clear();
 }
 
+bool BluetoothGATTServerService::IsAnyServiceRegistered() {
+  ScopeLogger();
+  return 0 != gatt_objects_.size();
+}
+
 }  // namespace bluetooth
 }  // namespace extension

diff --git a/src/bluetooth/bluetooth_gatt_server_service.h b/src/bluetooth/bluetooth_gatt_server_service.h
index 74b25dd..3d7579e 100644 (file)
--- a/src/bluetooth/bluetooth_gatt_server_service.h
+++ b/src/bluetooth/bluetooth_gatt_server_service.h
@@ -53,6 +53,8 @@ class BluetoothGATTServerService {
   static bool DestroyCharacteristic(int total, int index, bt_gatt_h handle, void* user_data);
   static bool DestroyDescriptor(int total, int index, bt_gatt_h handle, void* user_data);
 
+  bool IsAnyServiceRegistered();
+
  private:
   BluetoothInstance& instance_;
   std::map<int, bt_gatt_h> gatt_objects_;