Not disable adapter in factory test mode

Change-Id: I439f5687812055a90dd4f39f9d8959aead22fc80
Signed-off-by: Deokhyun Kim <dukan.kim@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/bt-core/bt-core-dbus-handler.c b/bt-core/bt-core-dbus-handler.c
old mode 100755 (executable)
new mode 100644 (file)
index 8f393e9..6884dd1
--- a/bt-core/bt-core-dbus-handler.c
+++ b/bt-core/bt-core-dbus-handler.c
@@ -40,6 +40,7 @@ static GDBusProxy *service_gproxy;
 #ifdef TIZEN_FEATURE_BT_HPS
 static GDBusProxy *hps_gproxy;
 #endif
+static gboolean factory_test_mode;
 
 void _bt_core_fill_garray_from_variant(GVariant *var, GArray *param)
 {
@@ -385,9 +386,14 @@ static void __bt_core_dbus_method(GDBusConnection *connection,
 
                g_variant_get(parameters, "(&s&s)", &type, &arg);
                ret = _bt_core_factory_test_mode(type, arg);
-               g_dbus_method_invocation_return_value(invocation,
+               factory_test_mode = TRUE;
+
+               if (ret == TRUE)
+                       g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(i)", ret));
-               _bt_core_terminate();
+               else
+                       _bt_core_terminate();
+
                 return;
        } else {
                ret = FALSE;
@@ -458,7 +464,7 @@ static void __handle_name_owner_changed(const char *name)
        if ((g_strcmp0(name, "org.bluez") == 0) ||
                (g_strcmp0(name, "org.projectx.bt") == 0)) {
                BT_DBG("%s is terminated", name);
-               if (_bt_check_terminating_condition() == TRUE) {
+               if (_bt_check_terminating_condition() == TRUE && factory_test_mode == FALSE) {
                        _bt_disable_adapter();
                        _bt_disable_adapter_le();
                        _bt_core_terminate();

diff --git a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
index 1eb95d40a09f8041a0b38de92d9ba34cc0f29a44..3e5c6324c9a51808a000c08f58ac02f71006a2bd 100644 (file)
--- a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
+++ b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
@@ -172,13 +172,6 @@ int _bt_enable_adapter(void)
        return __bt_adapter_state_handle_request(TRUE);
 }
 
-int _bt_enable_core(void)
-{
-       /* TODO_40 : 4.0 merge  */
-       BT_INFO("Not Supported");
-       return BLUETOOTH_ERROR_NOT_SUPPORT;
-}
-
 int _bt_recover_adapter(void)
 {
        int result = BLUETOOTH_ERROR_NONE;

diff --git a/bt-service-adaptation/services/bt-service-main.c b/bt-service-adaptation/services/bt-service-main.c
index 184e7780fe48d4b153d14953bfe17d328123e4e9..af2f2de15e90f80a072a62e5180823513af673e9 100644 (file)
--- a/bt-service-adaptation/services/bt-service-main.c
+++ b/bt-service-adaptation/services/bt-service-main.c
@@ -229,8 +229,6 @@ static gboolean __bt_check_bt_service(void *data)
 
                        /* Enable the BT */
                        _bt_enable_adapter();
-               } else if (bt_status == VCONFKEY_BT_STATUS_OFF && flight_mode_deactivation == 1) {
-                       _bt_enable_core();
                }
 
                if ((bt_le_status == VCONFKEY_BT_LE_STATUS_ON) && (le_status == BT_LE_DEACTIVATED)) {

diff --git a/bt-service-adaptation/services/include/bt-service-core-adapter.h b/bt-service-adaptation/services/include/bt-service-core-adapter.h
index 18e0375ddd08b48a6cdf4e0094307d90c4183dc4..7849b18f33b6c2993a50eb23bcaff5bd3f4f135f 100644 (file)
--- a/bt-service-adaptation/services/include/bt-service-core-adapter.h
+++ b/bt-service-adaptation/services/include/bt-service-core-adapter.h
@@ -54,8 +54,6 @@ void _bt_start_log_dump(const char *path);
 
 int _bt_check_adapter(int *status);
 
-int _bt_enable_core(void);
-
 int _bt_recover_adapter(void);
 
 int _bt_start_discovery(unsigned short max_response,