Replace System Setting API with Vconf key.

This patch replace use of system setting API
system_settings_set_value_bool(), with vconf key
VCONFKEY_TELEPHONY_FLIGHT_MODE, to enable/disable
flight mode.

Change-Id: I5540e2efee115a73187c4198b7847bd07232c43f
Signed-off-by: Nilesh Trimbake <t.shripati@samsung.com>

diff --git a/inc/moments/moments_control_view.h b/inc/moments/moments_control_view.h
index 1a8f4c951a2877d773355909b9c74abc16bd9924..7e177f4997cfe31e5cd438540d237f785c729409 100755 (executable)
--- a/inc/moments/moments_control_view.h
+++ b/inc/moments/moments_control_view.h
@@ -22,7 +22,7 @@
 #include <vconf.h>
 #include <Elementary.h>
 #include <sound_manager.h>
-#include <system_settings.h>
+
 
 typedef enum {
        MOMENTS_CONTROLS_DO_NOT_DISTURB,
@@ -82,7 +82,7 @@ void moments_control_do_not_disturb_status_changed_cb(keynode_t *node, void *use
 bool moments_control_get_do_not_disturb_popup_visible(void);
 void moments_control_flight_mode_popup_close(void);
 void moments_control_flight_mode_pressed_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-void moments_control_flight_mode_status_changed_cb(system_settings_key_e key, void *user_data);
+void moments_control_flight_mode_status_changed_cb(keynode_t *node, void *user_data);
 bool moments_control_get_flight_mode_popup_visible(void);
 void moments_control_volume_pressed_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 void moments_control_volume_status_changed_cb(sound_type_e type, unsigned int volume, void *data);

diff --git a/src/clock.c b/src/clock.c
index c04348c332b8f95283ac57d6f55c3a3cdd70fea3..bfda453028d38d4b53cb4a67ae3e15b75c3bce03 100755 (executable)
--- a/src/clock.c
+++ b/src/clock.c
@@ -23,7 +23,6 @@
 #include <time.h>
 #include <app_control.h>
 #include <app_manager.h>
-#include <system_settings.h>
 
 #include "conf.h"
 #include "clock_service.h"
@@ -195,17 +194,16 @@ static void _clock_set_dnd_status_changed_cb(keynode_t *node EINA_UNUSED, void *
        _clock_set_dnd_icon(is_dnd_mode, layout);
 }
 
-static void _clock_set_flight_mode_status_changed_cb(system_settings_key_e key, void *data)
+static void _clock_set_flight_mode_status_changed_cb(keynode_t *node EINA_UNUSED, void *data)
 {
        ret_if(!data);
        Evas_Object *layout = data;
 
-       bool is_flight_mode = false;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int is_flight_mode = 0;
+       int ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
 
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight_mode);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
+       if (ret < 0) {
+               _E("Failed to get vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
                return;
        }
 
@@ -233,13 +231,11 @@ static void _clock_set_noti_indicator_changed_cb(keynode_t *node EINA_UNUSED, vo
 
 static void _set_vconf_key_changed_cb(Evas_Object *layout)
 {
-       bool is_flight_mode = false;
-       int is_dnd_mode = 0, is_set_noti_indicator = 0;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int is_flight_mode = 0, is_dnd_mode = 0, is_set_noti_indicator = 0, ret = 0;
 
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight_mode);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
+       ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
+       if (ret < 0) {
+               _E("Failed to get vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
                return;
        }
 
@@ -262,11 +258,7 @@ static void _set_vconf_key_changed_cb(Evas_Object *layout)
        if (is_set_noti_indicator)
                clock_service_set_noti_indicator_icon();
 
-       ret = SYSTEM_SETTINGS_ERROR_NONE;
-       ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, _clock_set_flight_mode_status_changed_cb, layout);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_set_changed_cb failed: (%s)", get_error_message(ret));
-       }
+       vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, _clock_set_flight_mode_status_changed_cb, layout);
        vconf_notify_key_changed(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, _clock_set_dnd_status_changed_cb, layout);
        vconf_notify_key_changed(VCONFKEY_SETAPPL_NOTIFICATION_INDICATOR, _clock_set_noti_indicator_changed_cb, layout);
 }

diff --git a/src/moments/moments_control_flight_mode.c b/src/moments/moments_control_flight_mode.c
index a1cc5540c847c2fb41aacf44648007ddead9a085..75591c4783dc69e492b79b00952760f58d161d49 100755 (executable)
--- a/src/moments/moments_control_flight_mode.c
+++ b/src/moments/moments_control_flight_mode.c
@@ -22,7 +22,6 @@
 #include <ITapiModem.h>
 #include <TelPower.h>
 #include <vconf.h>
-#include <system_settings.h>
 
 #include "log.h"
 #include "util.h"
@@ -142,16 +141,15 @@ static void __flight_mode_popup_cancel_cb(void *data, Evas_Object *obj, void *ev
 
 static void __flight_mode_popup_ok_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int ret = 0;
 
        if (evas_object_visible_get(s_info.flight_mode_popup) == false)
                return;
 
        if (!moments_check_is_3g_device()) {
-               ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, true);
-               if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-                       _E("system_settings_set_value_bool failed: %s", get_error_message(ret));
-               }
+               ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, true);
+               if (ret < 0)
+                       _E("Failed to set vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
        } else {
                ret = __set_call_state_as_flight_mode(false);
                if (ret < 0)
@@ -227,44 +225,31 @@ bool moments_control_get_flight_mode_popup_visible(void)
 
 void moments_control_flight_mode_pressed_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       bool is_flight_mode = false;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int is_flight_mode = false;
 
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight_mode);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
-               is_flight_mode = false;
-       }
+       vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
        if (is_flight_mode == false) {
                moments_hide();
                __flight_mode_popup_view_create();
        } else {
+               int ret = 0;
                if (moments_check_is_3g_device()) {
-                       ret = 0;
                        ret = __set_call_state_as_flight_mode(is_flight_mode);
                        if (ret < 0)
                                _E("Failed to set call state as flight mode");
                } else {
-                       ret = SYSTEM_SETTINGS_ERROR_NONE;
-                       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, false);
-                       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-                               _E("system_settings_set_value_bool failed: %s", get_error_message(ret));
-                               return;
-                       }
+                       ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, false);
+                       if (ret < 0)
+                               _E("Failed to set vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
                }
        }
 }
 
-void moments_control_flight_mode_status_changed_cb(system_settings_key_e key, void *user_data)
+void moments_control_flight_mode_status_changed_cb(keynode_t *node, void *user_data)
 {
-       bool is_flight_mode = false;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int is_flight_mode = false;
 
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight_mode);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
-               is_flight_mode = false;
-       }
+       vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
        if (is_flight_mode == false)
                elm_object_signal_emit(control_button_list[MOMENTS_CONTROLS_FLIGHT_MODE].button_layout, "control_bar_off", "control_bar");
        else
@@ -288,22 +273,18 @@ Evas_Object *__t__get_moments_control_flight_mode_popup_layout(void)
 }
 void __t__set_moments_control_flight_mode_state(bool state)
 {
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
-       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, state);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_set_value_bool failed: %s", get_error_message(ret));
-       }
-       return;
+       int ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, state);
+       if (ret < 0)
+               _E("Failed to set vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
 }
 bool __t__get_moments_control_flight_mode_state(void)
 {
-       bool is_flight_mode = false;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int is_flight_mode = 0;
 
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight_mode);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
-               is_flight_mode = false;
+       int ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
+       if (ret < 0) {
+               _E("Failed to get vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
+               return 0;
        }
 
        return (bool)is_flight_mode;

diff --git a/src/moments/moments_control_view.c b/src/moments/moments_control_view.c
index 9d3c8b57d6b4052f065ee63009bb328c8f1ed164..2175db47aed414e6f6a41f1fa5ea097edfbc5177 100755 (executable)
--- a/src/moments/moments_control_view.c
+++ b/src/moments/moments_control_view.c
@@ -18,7 +18,6 @@
 #include <Elementary.h>
 #include <efl_extension.h>
 #include <vconf.h>
-#include <system_settings.h>
 
 #include "log.h"
 #include "util.h"
@@ -103,7 +102,7 @@ void moments_control_init(void)
        __update_control_view();
        moments_control_brightness_status_changed_cb(NULL, NULL);
        moments_control_do_not_disturb_status_changed_cb(NULL, NULL);
-       moments_control_flight_mode_status_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, NULL);
+       moments_control_flight_mode_status_changed_cb(NULL, NULL);
        moments_control_volume_status_changed_cb(0, 0, NULL);
 }
 
@@ -206,8 +205,6 @@ __fail:
 control_info_t *moments_control_create_button(Evas_Object *base_layout, int button_id)
 {
        control_info_t *button = (control_info_t *)malloc(sizeof(control_info_t));
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
-
        if (button == NULL) return NULL;
 
        button->index = control_button_list[button_id].index;
@@ -234,10 +231,9 @@ control_info_t *moments_control_create_button(Evas_Object *base_layout, int butt
 
                break;
        case MOMENTS_CONTROLS_FLIGHT_MODE:
-               ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, moments_control_flight_mode_status_changed_cb, NULL);
-               if (ret != SYSTEM_SETTINGS_ERROR_NONE){
-                       _E("system_settings_set_changed_cb failed : %s", get_error_message(ret));
-               }
+               if (vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, moments_control_flight_mode_status_changed_cb, NULL) < 0)
+                       _E("Failed to register the __flight_mode_status_changed_cb callback");
+
                break;
        case MOMENTS_CONTROLS_BRIGHTNESS:
                if (vconf_notify_key_changed(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, moments_control_brightness_status_changed_cb, NULL) < 0)
@@ -253,7 +249,6 @@ control_info_t *moments_control_create_button(Evas_Object *base_layout, int butt
 
 void moments_control_destroy_button(control_info_t *button_info)
 {
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
        if (button_info->button_layout != NULL) {
                evas_object_event_callback_del(button_info->button_layout, EVAS_CALLBACK_MOUSE_UP, __control_button_up_cb);
                evas_object_event_callback_del(button_info->button_layout, EVAS_CALLBACK_MOUSE_DOWN, __control_button_down_cb);
@@ -271,10 +266,7 @@ void moments_control_destroy_button(control_info_t *button_info)
                        sound_manager_remove_volume_changed_cb(s_info.volume_changed_cb_id);
                        break;
                case MOMENTS_CONTROLS_FLIGHT_MODE:
-                       ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE);
-                       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-                               _E("system_settings_unset_changed_cb Failed: %s", get_error_message(ret));
-                       }
+                       vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, moments_control_flight_mode_status_changed_cb);
                        break;
                case MOMENTS_CONTROLS_BRIGHTNESS:
                        vconf_ignore_key_changed(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, moments_control_brightness_status_changed_cb);

diff --git a/src/moments/moments_manager.c b/src/moments/moments_manager.c
index 8582007ffa8fcdb6ee0e9469731c913ee75ce77e..4104af952a4b7aa727f51a3176cbaee91c64757b 100755 (executable)
--- a/src/moments/moments_manager.c
+++ b/src/moments/moments_manager.c
@@ -23,7 +23,6 @@
 #include <runtime_info.h>
 #include <vconf.h>
 #include <package_manager.h>
-#include <system_settings.h>
 
 #include "log.h"
 #include "moments/moments.h"
@@ -62,7 +61,7 @@ static void __battery_state_changed_cb(device_callback_e type, void *value, void
 static void __telephony_service_state_changed_cb(telephony_h handle, telephony_noti_e noti_id, void *data,  void *user_data);
 static void __callsignal_state_changed_cb(telephony_h handle, telephony_noti_e noti_id, void *data,  void *user_data);
 static void __network_type_changed_cb(keynode_t *node, void *user_data);
-static void __flight_mode_changed_cb(system_settings_key_e key, void *user_data);
+static void __flight_mode_changed_cb(keynode_t *node, void *user_data);
 static void __wifi_state_changed_cb(keynode_t *node, void *user_data);
 static void __simcard_state_changed_cb(telephony_h handle, telephony_noti_e noti_id, void *data, void *user_data);
 static void __location_service_state_changed_cb(runtime_info_key_e key, void *data);
@@ -255,7 +254,7 @@ static void __initialize_status_view(void)
        __data_restriction_state_changed_cb(NULL, NULL);
        __bluetooth_state_changed_cb(NULL, NULL);
        __headset_state_changed_cb(NULL, NULL);
-       __flight_mode_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, NULL);
+       __flight_mode_changed_cb(NULL, NULL);
 
        s_info.on_initialization = false;
 }
@@ -326,7 +325,6 @@ static void __telephony_state_changed_cb(telephony_state_e state, void *user_dat
 
 static void __register_status_callback(void)
 {
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
        /* battery */
        device_add_callback(DEVICE_CALLBACK_BATTERY_CAPACITY, __battery_state_changed_cb, NULL);
        device_add_callback(DEVICE_CALLBACK_BATTERY_CHARGING, __battery_state_changed_cb, NULL);
@@ -347,10 +345,8 @@ static void __register_status_callback(void)
                        ret = telephony_set_state_changed_cb(__telephony_state_changed_cb, NULL);
        }
        /* FLIGHT MODE */
-       ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, __flight_mode_changed_cb, NULL);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_set_changed_cb Failed : %s", get_error_message(ret));
-       }
+       vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, __flight_mode_changed_cb, NULL);
+
        /* WIFI */
        vconf_notify_key_changed(VCONFKEY_WIFI_STATE, __wifi_state_changed_cb, NULL);
        vconf_notify_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, __wifi_state_changed_cb, NULL);
@@ -366,7 +362,6 @@ static void __register_status_callback(void)
 
 static void __unregister_status_callback(void)
 {
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
        /* Battery */
        device_remove_callback(DEVICE_CALLBACK_BATTERY_CAPACITY, __battery_state_changed_cb);
        device_remove_callback(DEVICE_CALLBACK_BATTERY_CHARGING, __battery_state_changed_cb);
@@ -408,10 +403,7 @@ static void __unregister_status_callback(void)
 
                s_info.telephony_initialized = false;
        }
-       ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_unset_changed_cb Failed: %s", get_error_message(ret));
-       }
+       vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, __flight_mode_changed_cb);
 
        vconf_ignore_key_changed(VCONFKEY_WIFI_STATE, __wifi_state_changed_cb);
        vconf_ignore_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, __wifi_state_changed_cb);
@@ -461,12 +453,10 @@ static void __callsignal_state_changed_cb(telephony_h handle, telephony_noti_e n
        _D("Callsignal Strength or Roaming State is changed");
        int callsignal_strength = 0;
        bool is_roaming = false;
-       bool is_flight = false;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int is_flight = 0;
 
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
+       if (vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight) < 0) {
+               _E("Failed to get vconfkey for flight");
                return;
        }
        if (!is_flight) {
@@ -500,12 +490,10 @@ static void __network_type_changed_cb(keynode_t *node, void *user_data)
        _D("Network type or Packet type is changed");
        int network_type = 0;
        int packet_type = 0;
-       bool is_flight = false;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int is_flight = 0;
 
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
+       if (vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight) < 0) {
+               _E("Failed to get vconfkey for flight");
                return;
        }
        if (!is_flight) {
@@ -546,14 +534,12 @@ static void __network_disable(void)
        moments_status_network_update(network_type, packet_type);
 }
 
-static void __flight_mode_changed_cb(system_settings_key_e key, void *user_data)
+static void __flight_mode_changed_cb(keynode_t *node, void *user_data)
 {
-       bool is_flight = false;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int is_flight = 0;
 
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
+       if (vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight) < 0) {
+               _E("Failed to get vconfkey for flight");
                return;
        }
        _D("Flight Mode is changed to [%d]", is_flight);
@@ -710,12 +696,10 @@ static void __callforwarding_state_changed_cb(keynode_t *node, void *user_data)
 {
        _D("Callforwarding State is changed");
        int state = 0;
-       bool is_flight = false;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
+       int is_flight = 0;
 
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
+       if (vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight) < 0) {
+               _E("Failed to get vconfkey for flight");
                return;
        }
        if (vconf_get_int(VCONFKEY_TELEPHONY_CALL_FORWARD_STATE, &state) < 0) {
@@ -757,18 +741,16 @@ static void __simcard_state_changed_cb(telephony_h handle, telephony_noti_e noti
 static void __location_service_state_changed_cb(runtime_info_key_e key, void *data)
 {
        _D("LOCATION SERVICE STATE CHANGED");
-       bool is_flight = false;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
-
+       int is_flight = 0;
        runtime_info_gps_status_e gps_status = 0;
 
        if (runtime_info_get_value_int(RUNTIME_INFO_KEY_GPS_STATUS, (int *)&gps_status) < 0) {
                _E("Failed to get location service state");
                return;
        }
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, &is_flight);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               _E("system_settings_get_value_bool failed: %s", get_error_message(ret));
+
+       if (vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight) < 0) {
+               _E("Failed to get FLIGHT MODE VCONFKEY");
                return;
        }