Remove unused vconf key

Change-Id: I6f39b248db34ecc3d62417f590d2476156b49cd9

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index cb63c69..b3fb0bf 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.133
+Version:       1.1.134
 Release:       3
 Group:         System/Network
 License:       Apache-2.0

diff --git a/src/wifi-power.c b/src/wifi-power.c
index 6ed9e8f..e052147 100755 (executable)
--- a/src/wifi-power.c
+++ b/src/wifi-power.c
@@ -46,9 +46,6 @@
 #define VCONF_WIFI_OFF_STATE_BY_AIRPLANE       "file/private/wifi/wifi_off_by_airplane"
 #define VCONF_WIFI_OFF_STATE_BY_RESTRICTED     "file/private/wifi/wifi_off_by_restricted"
 #define VCONF_WIFI_OFF_STATE_BY_EMERGENCY      "file/private/wifi/wifi_off_by_emergency"
-#if defined TIZEN_WEARABLE
-#define VCONF_WIFI_WEARABLE_WIFI_USE                   "db/private/wifi/wearable_wifi_use"
-#endif
 #if !defined TIZEN_WEARABLE
 #define VCONFKEY_SETAPPL_NETWORK_PERMIT_WITH_LCD_OFF_LIMIT     "db/setting/network_with_lcd_off_limit"
 #endif
@@ -69,10 +66,6 @@ static gboolean connman_wifi_technology_state = FALSE;
 static gboolean wifi_firmware_recovery_mode = FALSE;
 static int airplane_mode = 0;
 
-#if defined TIZEN_WEARABLE
-static int psmode_wifi_use = 1;
-#endif
-
 static gboolean __is_wifi_restricted(void)
 {
 #if defined TIZEN_WEARABLE
@@ -325,26 +318,15 @@ void netconfig_wifi_disable_technology_state_by_only_connman_signal(void)
 int netconfig_wifi_on_wearable(gboolean device_picker_test)
 {
        int err = 0;
-       int wifi_use;
        int ps_mode;
 
-       if (netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use) < 0) {
-               ERR("Fail to get VCONF_WIFI_WEARABLE_WIFI_USE");
+       if (netconfig_vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &ps_mode) < 0) {
+               ERR("Fail to get VCONFKEY_SETAPPL_PSMODE");
                return -EIO;
        }
 
-       if (wifi_use > 0) {
-               if (netconfig_vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &ps_mode) < 0) {
-                       ERR("Fail to get VCONFKEY_SETAPPL_PSMODE");
-                       return -EIO;
-               }
-
-               if (ps_mode > SETTING_PSMODE_NORMAL) {
-                       WARN("ps mode is on(%d), Not turn on Wi-Fi", ps_mode);
-                       return -EPERM;
-               }
-       } else {
-               WARN("Not permitted Wi-Fi on");
+       if (ps_mode > SETTING_PSMODE_NORMAL) {
+               WARN("ps mode is on(%d), Not turn on Wi-Fi", ps_mode);
                return -EPERM;
        }
 
@@ -359,39 +341,6 @@ int netconfig_wifi_on_wearable(gboolean device_picker_test)
 
        return err;
 }
-
-static void __wearable_wifi_use_changed_cb(keynode_t* node, void* user_data)
-{
-       int wifi_state;
-       int wifi_use = 1;
-
-       if (netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) {
-               ERR("Fail to get VCONFKEY_WIFI_STATE");
-               return;
-       }
-
-       if (node != NULL)
-               wifi_use = vconf_keynode_get_int(node);
-       else
-               netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use);
-
-       if (wifi_use > 0) {
-               DBG("wifi use on");
-               if (wifi_state > VCONFKEY_WIFI_OFF) {
-                       WARN("Wi-Fi is already turned on");
-                       return;
-               }
-               wifi_power_on_wearable(TRUE);
-       } else {
-               ERR("## wifi use [OFF]");
-               if (wifi_state == VCONFKEY_WIFI_OFF) {
-                       WARN("Wi-Fi is already turned off");
-                       return;
-               }
-
-               wifi_power_off();
-       }
-}
 #else
 static void __netconfig_wifi_restrict_mode(keynode_t *node, void *user_data)
 {
@@ -440,12 +389,7 @@ static void __netconfig_wifi_airplane_mode(keynode_t *node, void *user_data)
        int wifi_off_by_airplane = 0;
 
        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);
@@ -469,23 +413,16 @@ 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
        }
 }
 
@@ -496,10 +433,6 @@ static void __emergency_mode_changed_cb(keynode_t *node, void *user_data)
 #if !defined TIZEN_WEARABLE
        int emergency_by_fmm = 0;
 #endif
-#if defined TIZEN_WEARABLE
-       int wifi_use = 1;
-#endif
-
        netconfig_vconf_get_int(VCONF_WIFI_OFF_STATE_BY_EMERGENCY, &wifi_off_by_emergency);
        netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
 
@@ -523,11 +456,6 @@ static void __emergency_mode_changed_cb(keynode_t *node, void *user_data)
                /* basic power saving mode on */
        } else if (emergency == SETTING_PSMODE_WEARABLE_ENHANCED) {
                /* enhanced power saving mode on */
-               netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use);
-               psmode_wifi_use = wifi_use;
-               if (wifi_use != 0)
-                       netconfig_set_vconf_int(VCONF_WIFI_WEARABLE_WIFI_USE, 0);
-
                if (wifi_state == VCONFKEY_WIFI_OFF)
                        return;
 
@@ -535,7 +463,6 @@ static void __emergency_mode_changed_cb(keynode_t *node, void *user_data)
                netconfig_set_vconf_int(VCONF_WIFI_OFF_STATE_BY_EMERGENCY, 1);
        } else {
                /* power saving mode off */
-               netconfig_set_vconf_int(VCONF_WIFI_WEARABLE_WIFI_USE, psmode_wifi_use);
                if (!wifi_off_by_emergency)
                        return;
 
@@ -729,23 +656,12 @@ int wifi_power_off(void)
 int wifi_power_on_wearable(gboolean device_picker_test)
 {
        int err = 0;
-       int wifi_use = 1;
        wifi_tech_state_e tech_state;
 
        tech_state = wifi_state_get_technology_state();
        if (tech_state >= NETCONFIG_WIFI_TECH_POWERED)
                return -EALREADY;
 
-       if (netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use) < 0) {
-               ERR("Fail to get VCONF_WIFI_WEARABLE_WIFI_USE");
-               return -EIO;
-       }
-
-       if (wifi_use == 0) {
-               WARN("VCONF_WIFI_WEARABLE_WIFI_USE is OFF");
-               return -EPERM;
-       }
-
        err = wifi_power_driver_and_supplicant(TRUE);
        if (err < 0 && err != -EALREADY)
                return err;
@@ -791,8 +707,6 @@ void wifi_power_initialize(void)
        }
 
 #if defined TIZEN_WEARABLE
-       vconf_notify_key_changed(VCONF_WIFI_WEARABLE_WIFI_USE, __wearable_wifi_use_changed_cb, NULL);
-
        vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
                        __netconfig_wifi_airplane_mode, NULL);
 #else