[TSAM-5458] Modified fligh mode function

In case of telephony feature is off, function for flight mode didn't work.

Change-Id: I8e50ca5beebe5f4fcace0d74c665d6fdf45fe3cc
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index d491379..d86e269 100755 (executable)
--- 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.78
+Version:       1.1.79
 Release:       2
 Group:         System/Network
 License:       Apache-2.0

diff --git a/src/wifi-firmware.c b/src/wifi-firmware.c
index ec5c72e..e416baa 100755 (executable)
--- a/src/wifi-firmware.c
+++ b/src/wifi-firmware.c
@@ -242,9 +242,7 @@ int netconfig_wifi_firmware(enum netconfig_wifi_firmware type, gboolean enable)
 #endif
 
 #if defined WLAN_CONCURRENT_MODE
-#if defined TIZEN_TELEPHONY_ENABLE
                        netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &flight_mode);
-#endif
                        if (flight_mode == 0 && type == NETCONFIG_WIFI_STA &&
                                        netconfig_is_wifi_direct_on() == TRUE) {
                                netconfig_interface_down(WIFI_IFNAME);

diff --git a/src/wifi-power.c b/src/wifi-power.c
index a9d15a5..b3eae8a 100755 (executable)
--- a/src/wifi-power.c
+++ b/src/wifi-power.c
@@ -487,53 +487,48 @@ static void __wearable_wifi_use_changed_cb(keynode_t* node, void* user_data)
                wifi_power_off();
        }
 }
-
-#if defined TIZEN_TELEPHONY_ENABLE
-static void __netconfig_wifi_wearable_airplane_mode(keynode_t *node,
-               void *user_data)
+#else
+static void __netconfig_wifi_restrict_mode(keynode_t *node, void *user_data)
 {
-       int wifi_use = 0, airplane_state = 0;
-       int wifi_use_off_by_airplane = 0;
+       int wifi_state = 0, restricted = 0;
+       int wifi_off_by_restricted = 0;
 
-       netconfig_vconf_get_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE,
-                       &wifi_use_off_by_airplane);
+       netconfig_vconf_get_int(VCONF_WIFI_OFF_STATE_BY_RESTRICTED, &wifi_off_by_restricted);
 
-       netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use);
+       netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
 
        if (node != NULL)
-               airplane_state = vconf_keynode_get_bool(node);
+               restricted = vconf_keynode_get_bool(node);
        else
-               netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &airplane_state);
+               netconfig_vconf_get_bool(VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE, &restricted);
 
-       DBG("airplane mode %s (prev:%d)", airplane_state > 0 ? "ON" : "OFF", airplane_mode);
-       DBG("Wi-Fi use %d, Wi-Fi was off by flight mode %s", wifi_use,
-                       wifi_use_off_by_airplane ? "Yes" : "No");
+       DBG("network restricted mode %s", restricted > 0 ? "ON" : "OFF");
+       DBG("Wi-Fi state %d, Wi-Fi was off by restricted mode %s", wifi_state,
+                       wifi_off_by_restricted ? "Yes" : "No");
 
-       if (airplane_mode == airplane_state)
-               return ;
+       if (restricted > 0) {
+               /* network restricted on */
+               if (wifi_state == VCONFKEY_WIFI_OFF)
+                       return;
 
-       airplane_mode = airplane_state;
+               wifi_power_off();
 
-       if (airplane_state > 0) {
-               /* airplane mode on */
-               if (wifi_use == 0)
+               netconfig_set_vconf_int(VCONF_WIFI_OFF_STATE_BY_RESTRICTED, 1);
+       } else {
+               /* network restricted off */
+               if (!wifi_off_by_restricted)
                        return;
 
-               netconfig_set_vconf_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE, 1);
-               netconfig_set_vconf_int(VCONF_WIFI_WEARABLE_WIFI_USE, 0);
+               netconfig_set_vconf_int(VCONF_WIFI_OFF_STATE_BY_RESTRICTED, 0);
 
-       } else {
-               /* airplane mode off */
-               if (!wifi_use_off_by_airplane)
+               if (wifi_state > VCONFKEY_WIFI_OFF)
                        return;
 
-               netconfig_set_vconf_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE, 0);
-               netconfig_set_vconf_int(VCONF_WIFI_WEARABLE_WIFI_USE, 1);
+               wifi_power_on();
        }
 }
 #endif
-#else
-#if defined TIZEN_TELEPHONY_ENABLE
+
 static void __netconfig_wifi_airplane_mode(keynode_t *node, void *user_data)
 {
        int wifi_state = 0, airplane_state = 0;
@@ -541,7 +536,11 @@ static void __netconfig_wifi_airplane_mode(keynode_t *node, void *user_data)
 
        netconfig_vconf_get_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE, &wifi_off_by_airplane);
 
+#if defined TIZEN_WEARABLE
+       netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_state)
+#else
        netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
+#endif
 
        if (node != NULL)
                airplane_state = vconf_keynode_get_bool(node);
@@ -549,7 +548,7 @@ static void __netconfig_wifi_airplane_mode(keynode_t *node, void *user_data)
                netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &airplane_state);
 
        DBG("airplane mode %s (prev:%d)", airplane_state > 0 ? "ON" : "OFF", airplane_mode);
-       DBG("Wi-Fi state %d, Wi-Fi was off by flight mode %s", wifi_state,
+       DBG("Wi-Fi state(or use) %d, Wi-Fi was off by flight mode %s", wifi_state,
                        wifi_off_by_airplane ? "Yes" : "No");
 
        if (airplane_mode == airplane_state)
@@ -565,61 +564,25 @@ static void __netconfig_wifi_airplane_mode(keynode_t *node, void *user_data)
                wifi_power_off();
 
                netconfig_set_vconf_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE, 1);
+#if defined TIZEN_WEARABLE
+               netconfig_set_vconf_int(VCONF_WIFI_WEARABLE_WIFI_USE, 0);
+#endif
        } else {
                /* airplane mode off */
                if (!wifi_off_by_airplane)
                        return;
 
                netconfig_set_vconf_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE, 0);
-
+#if defined TIZEN_WEARABLE
+               netconfig_set_vconf_int(VCONF_WIFI_WEARABLE_WIFI_USE, 1);
+#else
                if (wifi_state > VCONFKEY_WIFI_OFF)
                        return;
 
                wifi_power_on();
-       }
-}
 #endif
-
-static void __netconfig_wifi_restrict_mode(keynode_t *node, void *user_data)
-{
-       int wifi_state = 0, restricted = 0;
-       int wifi_off_by_restricted = 0;
-
-       netconfig_vconf_get_int(VCONF_WIFI_OFF_STATE_BY_RESTRICTED, &wifi_off_by_restricted);
-
-       netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
-
-       if (node != NULL)
-               restricted = vconf_keynode_get_bool(node);
-       else
-               netconfig_vconf_get_bool(VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE, &restricted);
-
-       DBG("network restricted mode %s", restricted > 0 ? "ON" : "OFF");
-       DBG("Wi-Fi state %d, Wi-Fi was off by restricted mode %s", wifi_state,
-                       wifi_off_by_restricted ? "Yes" : "No");
-
-       if (restricted > 0) {
-               /* network restricted on */
-               if (wifi_state == VCONFKEY_WIFI_OFF)
-                       return;
-
-               wifi_power_off();
-
-               netconfig_set_vconf_int(VCONF_WIFI_OFF_STATE_BY_RESTRICTED, 1);
-       } else {
-               /* network restricted off */
-               if (!wifi_off_by_restricted)
-                       return;
-
-               netconfig_set_vconf_int(VCONF_WIFI_OFF_STATE_BY_RESTRICTED, 0);
-
-               if (wifi_state > VCONFKEY_WIFI_OFF)
-                       return;
-
-               wifi_power_on();
        }
 }
-#endif
 
 static void __emergency_mode_changed_cb(keynode_t *node, void *user_data)
 {
@@ -956,9 +919,7 @@ void wifi_power_initialize(void)
        int wifi_last_power_state = 0;
 
        /* Initialize Airplane mode */
-#if defined TIZEN_TELEPHONY_ENABLE
        netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &airplane_mode);
-#endif
        DBG("Airplane[%s]", airplane_mode > 0 ? "ON" : "OFF");
 
        /* Update the last Wi-Fi power state */
@@ -987,18 +948,14 @@ void wifi_power_initialize(void)
 #if defined TIZEN_WEARABLE
        vconf_notify_key_changed(VCONF_WIFI_WEARABLE_WIFI_USE, __wearable_wifi_use_changed_cb, NULL);
 
-#if defined TIZEN_TELEPHONY_ENABLE
        vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
-                       __netconfig_wifi_wearable_airplane_mode, NULL);
-#endif
+                       __netconfig_wifi_airplane_mode, NULL);
 #else
        vconf_notify_key_changed(VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE,
                        __netconfig_wifi_restrict_mode, NULL);
-#if defined TIZEN_TELEPHONY_ENABLE
        vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
                        __netconfig_wifi_airplane_mode, NULL);
 #endif
-#endif
 
        vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE, __emergency_mode_changed_cb, NULL);
        vconf_notify_key_changed(VCONFKEY_PM_STATE, __pm_state_changed_cb, NULL);