X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-core%2Fbt-core-main.c;h=53472e87a3fbba7c40e584331b9336dd11e528be;hb=8f7482968bb63e7a3db02a19830557aa20af010f;hp=b5c37f037fc5463f11a3ebd75c23aba7b1ebc437;hpb=449d38c6b737be52e1e166ed281bf8c778847e62;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-core/bt-core-main.c b/bt-core/bt-core-main.c
old mode 100755
new mode 100644
index b5c37f0..53472e8
--- a/bt-core/bt-core-main.c
+++ b/bt-core/bt-core-main.c
@@ -80,22 +80,20 @@ static gboolean __bt_check_bt_core(void *data)
 	int flight_mode_deactivation = 0;
 	int bt_off_due_to_timeout = 0;
 	int ps_mode_deactivation = 0;
-	int ret;
 
 	status = _bt_core_get_status();
 	le_status = _bt_core_get_le_status();
 	BT_DBG("State: %d, LE State: %d", status, le_status);
 
-	if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_status) < 0) {
+	if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_status) < 0)
 		BT_DBG("no bluetooth device info, so BT was disabled at previous session");
-	}
 
+/*
 #ifdef ENABLE_TIZEN_2_4
-	if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_le_status) < 0) {
+	if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_le_status) < 0)
 		BT_ERR("no bluetooth le info, so BT LE was disabled at previous session");
-	}
 #endif
-
+*/
 	if (vconf_get_int(BT_OFF_DUE_TO_FLIGHT_MODE, &flight_mode_deactivation) != 0)
 		BT_ERR("Fail to get the flight_mode_deactivation value");
 
@@ -108,16 +106,9 @@ static gboolean __bt_check_bt_core(void *data)
 	if ((bt_status != VCONFKEY_BT_STATUS_OFF || bt_off_due_to_timeout) &&
 		(status == BT_DEACTIVATED)) {
 		BT_DBG("Previous session was enabled.");
-
-		/* Enable the BT */
-		_bt_core_service_request_adapter(BT_ENABLE_ADAPTER);
-#ifndef USB_BLUETOOTH
-		_bt_enable_adapter();
-#endif
 	} else if (bt_status == VCONFKEY_BT_STATUS_OFF &&
 			(flight_mode_deactivation == 1 || ps_mode_deactivation > 0)) {
-		_bt_core_handle_flight_mode_noti();
-		_bt_core_handle_power_saving_mode_noti();
+		//_bt_core_handle_flight_mode_noti();
 
 		_bt_core_set_bt_status(BT_FLIGHT_MODE, flight_mode_deactivation);
 		_bt_core_set_bt_status(BT_POWER_SAVING_MODE, ps_mode_deactivation);
@@ -125,12 +116,6 @@ static gboolean __bt_check_bt_core(void *data)
 
 	if ((bt_le_status == VCONFKEY_BT_LE_STATUS_ON) && (le_status == BT_LE_DEACTIVATED)) {
 		BT_DBG("Previous session was le enabled. Turn BT LE on automatically.");
-
-		/* Enable the BT LE */
-		_bt_core_service_request_adapter(BT_ENABLE_ADAPTER_LE);
-#ifndef USB_BLUETOOTH
-		_bt_enable_adapter_le();
-#endif
 	} else {
 		status = _bt_core_get_status();
 		le_status = _bt_core_get_le_status();
@@ -149,7 +134,6 @@ int main(void)
 	gboolean ret;
 	struct sigaction sa;
 
-	g_type_init();
 	BT_INFO_C("Starting bt-core daemeon");
 
 	_bt_core_update_status();