Merge branch 'tizen' into tizen_5.5

[platform/core/connectivity/bluetooth-frwk.git] / bt-core / bt-core-adapter.c

diff --git a/bt-core/bt-core-adapter.c b/bt-core/bt-core-adapter.c
index c2b142f..f89fda5 100644 (file)
--- a/bt-core/bt-core-adapter.c
+++ b/bt-core/bt-core-adapter.c
@@ -211,12 +211,6 @@ static int __bt_stack_up(void)
                return -1;
        }
 
-       ret = __bt_call_systemact_service(BT_SYSTEMACT_STACK_UP);
-       if (ret < 0) {
-               BT_ERR("Failed to call systemact service");
-               return -1;
-       }
-
        /* activate Bluez */
        ret = __bt_call_systemact_service(BT_SYSTEMACT_BLUEZ_START);
        if (ret < 0) {
@@ -397,6 +391,7 @@ int _bt_enable_adapter_le(void)
        bt_status_t status;
        bt_le_status_t le_status;
        le_status = _bt_core_get_le_status();
+       retv_if(le_status == BT_LE_ACTIVATED, 0);
        retv_if(le_status != BT_LE_DEACTIVATED, -1);
 
        status = _bt_core_get_status();
@@ -838,14 +833,11 @@ gboolean _bt_core_factory_test_mode(const char *type, const char *arg)
 static gboolean __bt_core_recovery_cb(gpointer data)
 {
        int ret = 0;
-#ifdef TIZEN_FEATURE_BUSACT
        gboolean is_request_failed = FALSE;
        static gboolean is_first_failure = TRUE;
-#endif
 
        BT_DBG("+");
 
-#ifdef TIZEN_FEATURE_BUSACT
        if (_bt_core_get_bt_status(BT_RECOVERY_MODE) == 1) {
                ret = _bt_core_service_request_adapter(BT_ENABLE_ADAPTER);
                if (ret < 0)
@@ -870,7 +862,6 @@ static gboolean __bt_core_recovery_cb(gpointer data)
                }
        } else
                is_first_failure = TRUE;
-#endif
 
        if (_bt_core_get_bt_status(BT_RECOVERY_MODE) == 1) {
                _bt_core_set_bt_status(BT_RECOVERY_MODE, 0);