Fix dbus timeout issue

Remove deprecated recover logic

Change-Id: I2d737b7049effa9772a2d0ef36fe0d17ea3501e6
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/bt-core/bt-core-adapter.c b/bt-core/bt-core-adapter.c
index 7c2ea5c..7a79afc 100644 (file)
--- a/bt-core/bt-core-adapter.c
+++ b/bt-core/bt-core-adapter.c
@@ -645,11 +645,9 @@ gboolean _bt_core_recover_adapter(void)
 
        if (_bt_core_get_status() == BT_ACTIVATED) {
                _bt_core_set_bt_status(BT_RECOVERY_MODE, 1);
-               _bt_core_service_request_adapter(BT_DISABLE_ADAPTER);
        }
        if (_bt_core_get_le_status() == BT_LE_ACTIVATED) {
                _bt_core_set_bt_le_status(BT_RECOVERY_MODE, 1);
-               _bt_core_service_request_adapter(BT_DISABLE_ADAPTER_LE);
        }
 
        ret = _bt_disable_adapter();
@@ -871,7 +869,6 @@ static gboolean __bt_core_disable_timeout_cb(gpointer data)
                if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_status_before_mode) == 0)
                        _bt_core_set_bt_status(BT_FLIGHT_MODE, bt_status_before_mode);
 
-               _bt_core_service_request_adapter(BT_DISABLE_ADAPTER);
                _bt_disable_adapter();
        }
 
@@ -881,7 +878,6 @@ static gboolean __bt_core_disable_timeout_cb(gpointer data)
                if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_le_status_before_mode) == 0)
                        _bt_core_set_bt_le_status(BT_FLIGHT_MODE, bt_le_status_before_mode);
 
-               _bt_core_service_request_adapter(BT_DISABLE_ADAPTER_LE);
                _bt_disable_adapter_le();
        }
 

diff --git a/bt-core/bt-core-noti-handler.c b/bt-core/bt-core-noti-handler.c
index 03086bb..d992b44 100644 (file)
--- a/bt-core/bt-core-noti-handler.c
+++ b/bt-core/bt-core-noti-handler.c
@@ -71,8 +71,6 @@ static void __bt_core_handle_adapter_with_power_saving_mode(int power_saving_mod
                        if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_status_before_mode) == 0)
                                _bt_core_set_bt_status(BT_POWER_SAVING_MODE, bt_status_before_mode);
 
-                       _bt_core_service_request_adapter(BT_DISABLE_ADAPTER);
-
                        if (!TIZEN_FEATURE_BT_USB_DONGLE)
                                _bt_disable_adapter();
                }
@@ -82,9 +80,6 @@ static void __bt_core_handle_adapter_with_power_saving_mode(int power_saving_mod
                        if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_le_status_before_mode) == 0)
                                _bt_core_set_bt_le_status(BT_POWER_SAVING_MODE, bt_le_status_before_mode);
 
-                       /* Disable the BT LE */
-                       _bt_core_service_request_adapter(BT_DISABLE_ADAPTER_LE);
-
                        if (!TIZEN_FEATURE_BT_USB_DONGLE)
                                _bt_disable_adapter_le();
                }