From 05d378f0f6ba471d2e10f7b1d772a633fa4c3863 Mon Sep 17 00:00:00 2001 From: Nishant Chaprana Date: Thu, 8 Oct 2015 15:37:07 +0530 Subject: [PATCH] [Fix]Wi-Fi Auto Activation Issue Description: This patch fixes Auto activation issue of wifi for common profile. The telephony check in wifi-power.c was skipping wifi auto activation, due to which wifi was not actiated at restart and AP was not connected. It also disables TIZEN_TELEPHONY_ENABLE for TV profile. Change-Id: I53f510e87cb48bac9d1fe751db459dc6cc8eb978 Signed-off-by: Nishant Chaprana --- CMakeLists.txt | 4 +++- packaging/net-config.spec | 2 +- src/wifi-power.c | 11 +---------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92e9cd1..d67d3a4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,9 @@ IF(TIZEN_WEARABLE) SET(WEARABLE_REQUIRED_PKGS "weconn") ENDIF(TIZEN_WEARABLE) -ADD_DEFINITIONS(-DTIZEN_TELEPHONY_ENABLE) +IF(TIZEN_TELEPHONY_ENABLE) + ADD_DEFINITIONS(-DTIZEN_TELEPHONY_ENABLE) +ENDIF(TIZEN_TELEPHONY_ENABLE) IF(TIZEN_DEBUG_DISABLE) ADD_DEFINITIONS(-DTIZEN_DEBUG_DISABLE) diff --git a/packaging/net-config.spec b/packaging/net-config.spec index 7fc8ffb..d42f02b 100755 --- a/packaging/net-config.spec +++ b/packaging/net-config.spec @@ -1,6 +1,6 @@ Name: net-config Summary: TIZEN Network Configuration service -Version: 1.1.43 +Version: 1.1.44 Release: 2 Group: System/Network License: Apache-2.0 diff --git a/src/wifi-power.c b/src/wifi-power.c index c73e447..3b8df97 100755 --- a/src/wifi-power.c +++ b/src/wifi-power.c @@ -1074,14 +1074,9 @@ void wifi_power_initialize(void) DBG("Telephony API is not initialized yet"); vconf_notify_key_changed(VCONFKEY_TELEPHONY_READY, __netconfig_telephony_ready_changed_cb, NULL); - - goto done; } else { - if (netconfig_tapi_check_sim_state() == FALSE) { + if (netconfig_tapi_check_sim_state() == FALSE) DBG("SIM is not initialized yet"); - - goto done; - } } #endif DBG("Turn Wi-Fi on automatically"); @@ -1092,10 +1087,6 @@ void wifi_power_initialize(void) #endif } -#if defined TIZEN_TELEPHONY_ENABLE -done: -#endif - #if defined TIZEN_WEARABLE _weconn_set_state_changed_cb(W_SERVICE_TYPE_BT, NULL); vconf_notify_key_changed(VCONF_WIFI_WEARABLE_WIFI_USE, __wearable_wifi_use_changed_cb, NULL); -- 2.7.4