Code sync to fix build break 28/42728/1 accepted/tizen/mobile/20150708.015035 accepted/tizen/tv/20150708.015135 accepted/tizen/wearable/20150708.015228 submit/tizen/20150630.051205 submit/tizen/20150702.103311
authorJiwan Kim <ji-wan.kim@samsung.com>
Thu, 2 Jul 2015 02:26:33 +0000 (11:26 +0900)
committerJiwan Kim <ji-wan.kim@samsung.com>
Thu, 2 Jul 2015 02:27:06 +0000 (11:27 +0900)
 - Fix build break for vconf-internal-key package

Change-Id: I0dff651f530950a0d5ee5b6bbe58eac78a06eaac

CMakeLists.txt
packaging/tel-plugin-vconf.spec
src/desc-vconf.c

index a8ea7bf74a8c0d34de2de50bf76609af25be790e..923166546cf81a8dea06da774fc01ccf0fbb3fc1 100644 (file)
@@ -34,12 +34,12 @@ ADD_DEFINITIONS("-DTCORE_LOG_TAG=\"SP_VCONF\"")
 ADD_DEFINITIONS("-DPLUGIN_VERSION=${VERSION}")
 ADD_DEFINITIONS("-DEXPORT_API=__attribute__((visibility(\"default\")))")
 
-IF (TIZEN_FEATURE_DSDS)
-        ADD_DEFINITIONS("-DTIZEN_FEATURE_DSDS")
-ENDIF (TIZEN_FEATURE_DSDS)
 IF (TIZEN_FEATURE_CDMA)
        ADD_DEFINITIONS("-DTIZEN_FEATURE_CDMA")
 ENDIF (TIZEN_FEATURE_CDMA)
+IF(PREPAID_SIM_APN_SUPPORT)
+       ADD_DEFINITIONS("-DPREPAID_SIM_APN_SUPPORT")
+ENDIF(PREPAID_SIM_APN_SUPPORT)
 
 MESSAGE(${CMAKE_C_FLAGS})
 MESSAGE(${pkgs_LDFLAGS})
index 8a4320dc5e141dde7dcf05314fa78600f15ea399..7fca66734e94023f9dc15c4ff6cef58d14313582 100644 (file)
@@ -1,11 +1,11 @@
 %define major 0
-%define minor 1
-%define patchlevel 91
+%define minor 2
+%define patchlevel 3
 
 Name:           tel-plugin-vconf
 Version:        %{major}.%{minor}.%{patchlevel}
 Release:        1
-License:        Apache
+License:        Apache-2.0
 Summary:        Telephony Vconf storage plugin
 Group:          System/Libraries
 Source0:        tel-plugin-vconf-%{version}.tar.gz
@@ -28,11 +28,11 @@ versionint=$[%{major} * 1000000 + %{minor} * 1000 + %{patchlevel}]
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DLIB_INSTALL_DIR=%{_libdir} \
        -DVERSION=$versionint \
-#%if 0%{?model_build_feature_network_dsds}
-#        -DTIZEN_FEATURE_DSDS=1 \
-#%endif
 #%if 0%{?model_build_feature_telephony_cdma}
-#        -DTIZEN_FEATURE_CDMA=1 \
+#      -DTIZEN_FEATURE_CDMA=1 \
+#%endif
+#%if 0%{?prepaid_sim_apn_support}
+#      -DPREPAID_SIM_APN_SUPPORT=1 \
 #%endif
 
 make %{?_smp_mflags}
@@ -40,77 +40,6 @@ make %{?_smp_mflags}
 %post
 /sbin/ldconfig
 
-#Default Call Statistics
-vconftool set -t int db/dnet/statistics/cellular/totalsnt 0 -i -f -s system::vconf_system
-vconftool set -t int db/dnet/statistics/cellular/totalrcv 0 -i -f -s system::vconf_system
-vconftool set -t int db/dnet/statistics/cellular/lastsnt 0 -i -f -s system::vconf_system
-vconftool set -t int db/dnet/statistics/cellular/lastrcv 0 -i -f -s system::vconf_system
-vconftool set -t int db/dnet/statistics/cellular/lastsnt2 0 -i -f -s system::vconf_system
-vconftool set -t int db/dnet/statistics/cellular/totalrcv2 0 -i -f -s system::vconf_system
-vconftool set -t int db/dnet/statistics/cellular/totalsnt2 0 -i -f -s system::vconf_system
-vconftool set -t int db/dnet/statistics/cellular/lastrcv2 0 -i -f -s system::vconf_system
-
-#General Telephony Informations
-vconftool set -t bool memory/telephony/telephony_ready 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/tapi_state 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/daemon_load_count 0 -i -f -s system::vconf_system
-
-#Dnet Informations
-vconftool set -t int memory/dnet/state 0 -i -f -s system::vconf_system
-vconftool set -t int memory/dnet/cellular 4 -i -f -s system::vconf_system
-vconftool set -t int memory/dnet/packet_state 0 -i -f -s system::vconf_system
-vconftool set -t int memory/dnet/state2 0 -i -f -s system::vconf_system
-
-#Network Informations
-vconftool set -t int memory/telephony/svc_type 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/svc_cs 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/svc_ps 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/svc_act 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/ps_type 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/rssi 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/svc_roam 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/plmn 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/lac 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/cell_id 0 -i -f -s system::vconf_system
-vconftool set -t string memory/telephony/nw_name "" -i -f -s system::vconf_system
-vconftool set -t string memory/telephony/nitz_zone 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/nitz_gmt 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/nitz_event_gmt 0 -i -f -s system::vconf_system
-vconftool set -t bool db/telephony/flight_mode 0 -i -f -s system::vconf_system
-
-#Call Informations
-vconftool set -t int memory/telephony/call_state 0 -i -f -s system::vconf_system
-vconftool set -t int db/telephony/call_forward_state 0 -i -f -s system::vconf_system
-vconftool set -t int db/telephony/ss_cli_state 0 -i -f -s telephony_framework::vconf -g 6514
-vconftool set -t int db/telephony/ss_cli_state2 0 -i -f -s telephony_framework::vconf -g 6514
-
-#SIM informations
-vconftool set -t int memory/telephony/pb_init 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/sim_slot 0 -i -f -s system::vconf_system
-#vconf key for secondary sim slot
-vconftool set -t int memory/telephony/sim_slot2 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/sim_slot_count -1 -i -f -s system::vconf_system
-vconftool set -t string memory/telephony/spn "" -i -f -s telephony_framework::vconf
-vconftool set -t int memory/telephony/spn_disp_condition 0 -i -f -s telephony_framework::vconf
-vconftool set -t int memory/telephony/sim_status 255 -i -f -s telephony_framework::vconf
-vconftool set -t string memory/telephony/cphs_operator_name_full "" -i -f -s telephony_framework::vconf
-vconftool set -t string memory/telephony/cphs_operator_name_short "" -i -f -s telephony_framework::vconf
-vconftool set -t int memory/telephony/sim_is_changed -1 -i -f -s telephony_framework::vconf
-vconftool set -t int memory/telephony/sat_idle 0 -i -f -s system::vconf_system
-vconftool set -t int memory/telephony/sat_state 0 -i -f -s system::vconf_system
-vconftool set -t bool memory/private/telephony/modem_state 0 -i -f -s telephony_framework::vconf
-
-#etc...
-vconftool set -t int memory/telephony/zuhause_zone 0 -i -f -s system::vconf_system
-vconftool set -t string memory/telephony/idle_text "" -i -f -s system::vconf_system
-vconftool set -t int db/telephony/modem_always_on 2 -i -f -s system::vconf_system -g 6514
-
-#dds
-vconftool set -t int db/telephony/dualsim/default_data_service 0 -i -f -s system::vconf_system
-vconftool set -t int db/telephony/dualsim/preferred_voice_subscription 1 -i -f -s system::vconf_system
-vconftool set -t int db/telephony/dualsim/default_subscription 0 -i -f -s system::vconf_system
-vconftool set -t bool db/telephony/dualsim/receive_incoming_call 0 -i -f -s system::vconf_system -g 6514
-
 %postun -p /sbin/ldconfig
 
 %install
@@ -120,7 +49,7 @@ mkdir -p %{buildroot}%{_datadir}/license
 %files
 %manifest tel-plugin-vconf.manifest
 
-%defattr(-,root,root,-)
+%defattr(644,system,system,-)
 #%doc COPYING
 %{_libdir}/telephony/plugins/vconf-plugin*
 %{_datadir}/license/tel-plugin-vconf
index a54d5d8b6fc984009d02844beab32535d13597bd..e0d22a576b227711d8c0804a18b337189da46784 100644 (file)
 #define PLUGIN_VERSION 1
 #endif
 
-#ifndef VCONFKEY_SETAPPL_STATE_DATA_ROAMING_APP_STATUS
-#define VCONFKEY_SETAPPL_STATE_DATA_ROAMING_APP_STATUS VCONFKEY_SETAPPL_PREFIX"/data_roaming_app/status"
-#endif
-#define VCONFKEY_PRIVATE_TELEPHONY_NCK_UNLOCK_COUNT                    "memory/private/telephony/nck_unlock_count"
-#define VCONFKEY_PRIVATE_TELEPHONY_NO_SIM_POPUP_CHECKBOX               "db/private/telephony/no_sim_popup_checkbox"
-#define VCONFKEY_PRIVATE_TELEPHONY_DATA_ROAMING_POPUP_CHECKBOX "db/private/telephony/data_roaming_popup_checkbox"
-#define VCONFKEY_PRIVATE_TELEPHONY_MODEM_ON_COUNT                              "memory/private/telephony/modem_on_count"
-
 struct vconf_plugin_user_data {
        gboolean b_get_nck_retry_count;
 
@@ -52,17 +44,15 @@ struct vconf_plugin_user_data {
        long last_modem_state_timestamp;
 };
 
-#ifndef VCONFKEY_SETAPPL_MOBILE_DATA_POPUP_DONE
-#define VCONFKEY_SETAPPL_MOBILE_DATA_POPUP_DONE VCONFKEY_SETAPPL_PREFIX"/mobile_data_popup"
-#endif
-
-#define VCONFKEY_TELEPHONY_DB_DEFAULT_DATA_SUBS  "db/telephony/dualsim/default_data_service"
-#define VCONFKEY_TELEPHONY_PREFERRED_VOICE_SUBSCRIPTION        "db/telephony/dualsim/preferred_voice_subscription"
-#define VCONFKEY_TELEPHONY_DB_DEFAULT_SUBS     "db/telephony/dualsim/default_subscription"
+#define VCONFKEY_WECONN_ALL_CONNECTED  "memory/private/weconn/all_connected" /* True/False */
+#define VCONFKEY_SAP_CONNECTION_TYPE           "memory/private/sap/conn_type" /* SAPInterface.h */
 
-#define VCONFKEY_WECONN_ALL_CONNECTED  "memory/private/weconn/all_connected" // True/False
-#define VCONFKEY_SAP_CONNECTION_TYPE   "memory/private/sap/conn_type" // SAPInterface.h
-#define VCOKFKEY_TELEPHONY_MODEM_STATE  "memory/private/telephony/modem_state"
+#ifndef VCONFKEY_TESTMODE_FAST_DORMANCY
+#define VCONFKEY_TESTMODE_FAST_DORMANCY "memory/testmode/fast_dormancy"
+#endif
+#ifndef VCONFKEY_TESTMODE_FAST_DORMANCY2
+#define VCONFKEY_TESTMODE_FAST_DORMANCY2 "memory/testmode/fast_dormancy2"
+#endif
 
 static void reset_vconf();
 
@@ -88,18 +78,16 @@ static void __vconf_write_power_status_log(struct vconf_plugin_user_data *ud, en
        if (ud == NULL)
                return;
 
-       if (0 != sysinfo(&sys_info)) {
+       if (0 != sysinfo(&sys_info))
                err("sysinfo failed.");
-       }
 
        if (state == MODEM_STATE_ONLINE) {
                if (ud->last_modem_power_state == MODEM_STATE_LOW) {
                        int count = 0;
-                       if (0 == vconf_get_int(VCONFKEY_PRIVATE_TELEPHONY_MODEM_ON_COUNT, &count)) {
+                       if (0 == vconf_get_int(VCONFKEY_TELEPHONY_PRIVATE_MODEM_ON_COUNT, &count)) {
                                count++;
-                               if (0 != vconf_set_int(VCONFKEY_PRIVATE_TELEPHONY_MODEM_ON_COUNT, count)) {
+                               if (0 != vconf_set_int(VCONFKEY_TELEPHONY_PRIVATE_MODEM_ON_COUNT, count))
                                        err("vconf_set_int failed.");
-                               }
                        } else {
                                err("vconf_get_int failed.");
                        }
@@ -111,9 +99,9 @@ static void __vconf_write_power_status_log(struct vconf_plugin_user_data *ud, en
        } else if (state == MODEM_STATE_LOW) {
                if (ud->last_modem_power_state == MODEM_STATE_ONLINE) {
                        int count = 0;
-                       if (0 != vconf_get_int(VCONFKEY_PRIVATE_TELEPHONY_MODEM_ON_COUNT, &count)) {
+                       if (0 != vconf_get_int(VCONFKEY_TELEPHONY_PRIVATE_MODEM_ON_COUNT, &count))
                                err("vconf_get_int failed.");
-                       }
+
                        msg("[MODEM ON/OFF] MODEM ON => LOW in %d secs. (modem_on_count=[%d] after boot-up(uptime %ld secs))",
                                        sys_info.uptime - ud->last_modem_state_timestamp, count, sys_info.uptime);
                        ud->last_modem_power_state = state;
@@ -126,319 +114,252 @@ static void __vconf_check_and_set_int(const char *in_key, const int intval)
 {
        int current;
        vconf_get_int(in_key, &current);
-       if (current != intval) {
+       if (current != intval)
                vconf_set_int(in_key, intval);
-       }
 }
 
 static void __vconf_check_and_set_str(const char *in_key, const char *strval)
 {
        char *current = vconf_get_str(in_key);
 
-       if(current) {
-               if(strval && strcmp(current, strval)) {
+       if (current) {
+               if (strval && strcmp(current, strval))
                        vconf_set_str(in_key, strval);
-               }
+
                free(current);
-       }
-       else {
+       } else {
                vconf_set_str(in_key, strval);
        }
 }
 
-static const gchar* convert_strgkey_to_vconf(enum tcore_storage_key key)
+static const char *convert_strgkey_to_vconf(enum tcore_storage_key key)
 {
        switch (key) {
-               case STORAGE_KEY_TELEPHONY_PLMN:
-                       return VCONFKEY_TELEPHONY_PLMN;
-               case STORAGE_KEY_TELEPHONY_LAC:
-                       return VCONFKEY_TELEPHONY_LAC;
-               case STORAGE_KEY_TELEPHONY_CELLID:
-                       return VCONFKEY_TELEPHONY_CELLID;
-               case STORAGE_KEY_TELEPHONY_SVCTYPE:
-                       return VCONFKEY_TELEPHONY_SVCTYPE;
-               case STORAGE_KEY_TELEPHONY_SVC_CS:
-                       return VCONFKEY_TELEPHONY_SVC_CS;
-               case STORAGE_KEY_TELEPHONY_SVC_PS:
-                       return VCONFKEY_TELEPHONY_SVC_PS;
-               case STORAGE_KEY_TELEPHONY_SVC_ROAM:
-                       return VCONFKEY_TELEPHONY_SVC_ROAM;
-               case STORAGE_KEY_TELEPHONY_SIM_PB_INIT:
-                       return VCONFKEY_TELEPHONY_SIM_PB_INIT;
-               case STORAGE_KEY_TELEPHONY_CALL_FORWARD_STATE:
-                       return VCONFKEY_TELEPHONY_CALL_FORWARD_STATE;
-               case STORAGE_KEY_TELEPHONY_TAPI_STATE:
-                       return VCONFKEY_TELEPHONY_TAPI_STATE;
-               case STORAGE_KEY_TELEPHONY_SPN_DISP_CONDITION:
-                       return VCONFKEY_TELEPHONY_SPN_DISP_CONDITION;
-               case STORAGE_KEY_TELEPHONY_RSSI:
-                       return VCONFKEY_TELEPHONY_RSSI;
-               case STORAGE_KEY_TELEPHONY_READY:
-                       return VCONFKEY_TELEPHONY_READY;
-               case STORAGE_KEY_TELEPHONY_SIM_SLOT:
-                       return VCONFKEY_TELEPHONY_SIM_SLOT;
-#ifdef TIZEN_FEATURE_DSDS
-               case STORAGE_KEY_TELEPHONY_SIM_SLOT2:
-                       return VCONFKEY_TELEPHONY_SIM_SLOT2;
-#endif
-               case STORAGE_KEY_TELEPHONY_SIM_SLOT_COUNT:
-                       return VCONFKEY_TELEPHONY_SIM_SLOT_COUNT;
-               case STORAGE_KEY_PM_STATE:
-                       return VCONFKEY_PM_STATE;
-               case STORAGE_KEY_PACKET_SERVICE_STATE:
-                       return VCONFKEY_DNET_STATE;
-#ifdef TIZEN_FEATURE_DSDS
-               case STORAGE_KEY_PACKET_SERVICE_STATE2:
-                       return VCONFKEY_DNET_STATE2;
-#endif
-               case STORAGE_KEY_PACKET_INDICATOR_STATE:
-                       return VCONFKEY_PACKET_STATE;
-               case STORAGE_KEY_3G_ENABLE:
-                       return VCONFKEY_3G_ENABLE;
-               case STORAGE_KEY_TELEPHONY_DUALSIM_DEFAULT_DATA_SERVICE_INT:
-                       return VCONFKEY_TELEPHONY_DB_DEFAULT_DATA_SUBS;
-               case STORAGE_KEY_SETAPPL_STATE_DATA_ROAMING_BOOL:
-                       return VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL;
-               case STORAGE_KEY_TELEPHONY_NWNAME:
-                       return VCONFKEY_TELEPHONY_NWNAME;
-               case STORAGE_KEY_TELEPHONY_SPN_NAME:
-                       return VCONFKEY_TELEPHONY_SPN_NAME;
-               case STORAGE_KEY_CELLULAR_STATE:
-                       return VCONFKEY_NETWORK_CELLULAR_STATE;
-               case STORAGE_KEY_CELLULAR_PKT_TOTAL_RCV:
-                       return VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV;
-#ifdef TIZEN_FEATURE_DSDS
-               case STORAGE_KEY_CELLULAR_PKT_TOTAL_RCV2:
-                       return VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV2;
+       case STORAGE_KEY_TELEPHONY_PLMN:
+               return VCONFKEY_TELEPHONY_PLMN;
+       case STORAGE_KEY_TELEPHONY_LAC:
+               return VCONFKEY_TELEPHONY_LAC;
+       case STORAGE_KEY_TELEPHONY_CELLID:
+               return VCONFKEY_TELEPHONY_CELLID;
+       case STORAGE_KEY_TELEPHONY_SVCTYPE:
+               return VCONFKEY_TELEPHONY_SVCTYPE;
+       case STORAGE_KEY_TELEPHONY_SVC_CS:
+               return VCONFKEY_TELEPHONY_SVC_CS;
+       case STORAGE_KEY_TELEPHONY_SVC_PS:
+               return VCONFKEY_TELEPHONY_SVC_PS;
+       case STORAGE_KEY_TELEPHONY_SVC_ROAM:
+               return VCONFKEY_TELEPHONY_SVC_ROAM;
+       case STORAGE_KEY_TELEPHONY_SIM_PB_INIT:
+               return VCONFKEY_TELEPHONY_SIM_PB_INIT;
+       case STORAGE_KEY_TELEPHONY_CALL_FORWARD_STATE:
+               return VCONFKEY_TELEPHONY_CALL_FORWARD_STATE;
+       case STORAGE_KEY_TELEPHONY_TAPI_STATE:
+               return VCONFKEY_TELEPHONY_TAPI_STATE;
+       case STORAGE_KEY_TELEPHONY_SPN_DISP_CONDITION:
+               return VCONFKEY_TELEPHONY_SPN_DISP_CONDITION;
+       case STORAGE_KEY_TELEPHONY_RSSI:
+               return VCONFKEY_TELEPHONY_RSSI;
+       case STORAGE_KEY_TELEPHONY_READY:
+               return VCONFKEY_TELEPHONY_READY;
+       case STORAGE_KEY_TELEPHONY_SIM_SLOT:
+               return VCONFKEY_TELEPHONY_SIM_SLOT;
+       case STORAGE_KEY_TELEPHONY_SIM_SLOT2:
+               return VCONFKEY_TELEPHONY_SIM_SLOT2;
+       case STORAGE_KEY_TELEPHONY_SIM_SLOT_COUNT:
+               return VCONFKEY_TELEPHONY_SIM_SLOT_COUNT;
+       case STORAGE_KEY_PM_STATE:
+               return VCONFKEY_PM_STATE;
+       case STORAGE_KEY_PACKET_SERVICE_STATE:
+               return VCONFKEY_DNET_STATE;
+       case STORAGE_KEY_PACKET_SERVICE_STATE2:
+               return VCONFKEY_DNET_STATE2;
+       case STORAGE_KEY_PACKET_INDICATOR_STATE:
+               return VCONFKEY_PACKET_STATE;
+       case STORAGE_KEY_3G_ENABLE:
+               return VCONFKEY_3G_ENABLE;
+       case STORAGE_KEY_TELEPHONY_DUALSIM_DEFAULT_DATA_SERVICE_INT:
+               return VCONFKEY_TELEPHONY_DB_DEFAULT_DATA_SUBS;
+       case STORAGE_KEY_SETAPPL_STATE_DATA_ROAMING_BOOL:
+               return VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL;
+       case STORAGE_KEY_TELEPHONY_NWNAME:
+               return VCONFKEY_TELEPHONY_NWNAME;
+       case STORAGE_KEY_TELEPHONY_SPN_NAME:
+               return VCONFKEY_TELEPHONY_SPN_NAME;
+       case STORAGE_KEY_CELLULAR_STATE:
+               return VCONFKEY_NETWORK_CELLULAR_STATE;
+       case STORAGE_KEY_CELLULAR_PKT_TOTAL_RCV:
+               return VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV;
+       case STORAGE_KEY_CELLULAR_PKT_TOTAL_RCV2:
+               return VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV2;
+       case STORAGE_KEY_CELLULAR_PKT_TOTAL_SNT:
+               return VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT;
+       case STORAGE_KEY_CELLULAR_PKT_TOTAL_SNT2:
+               return VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT2;
+       case STORAGE_KEY_CELLULAR_PKT_LAST_RCV:
+               return VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV;
+       case STORAGE_KEY_CELLULAR_PKT_LAST_RCV2:
+               return VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2;
+       case STORAGE_KEY_CELLULAR_PKT_LAST_SNT:
+               return VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT;
+       case STORAGE_KEY_CELLULAR_PKT_LAST_SNT2:
+               return VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2;
+       case STORAGE_KEY_LANGUAGE_SET:
+               return VCONFKEY_LANGSET;
+       case STORAGE_KEY_FLIGHT_MODE_BOOL:
+               return VCONFKEY_TELEPHONY_FLIGHT_MODE;
+#ifdef TIZEN_FEATURE_FAST_DORMANCY_ENABLE
+       case STORAGE_KEY_TESTMODE_FAST_DORMANCY:
+               return VCONFKEY_TESTMODE_FAST_DORMANCY;
+       case STORAGE_KEY_TESTMODE_FAST_DORMANCY2:
+               return VCONFKEY_TESTMODE_FAST_DORMANCY2;
 #endif
-               case STORAGE_KEY_CELLULAR_PKT_TOTAL_SNT:
-                       return VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT;
-#ifdef TIZEN_FEATURE_DSDS
-               case STORAGE_KEY_CELLULAR_PKT_TOTAL_SNT2:
-                       return VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT2;
+       case STORAGE_KEY_POWER_SAVING_MODE:
+               return VCONFKEY_SETAPPL_PSMODE;
+       case STORAGE_KEY_SETAPPL_NETWORK_RESTRICT_MODE:
+               return VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE;
+       case STORAGE_KEY_SETAPPL_MOBILE_DATA_POPUP_DONE_BOOL:
+               return VCONFKEY_SETAPPL_MOBILE_DATA_POPUP_DONE;
+       case STORAGE_KEY_MSG_SERVER_READY_BOOL:
+               return VCONFKEY_MSG_SERVER_READY;
+       case STORAGE_KEY_TELEPHONY_PREFERRED_VOICE_SUBSCRIPTION:
+               return VCONFKEY_TELEPHONY_PREFERRED_VOICE_SUBSCRIPTION;
+       case STORAGE_KEY_TELEPHONY_DUALSIM_DEFAULT_SERVICE_INT:
+               return VCONFKEY_TELEPHONY_DB_DEFAULT_SUBS;
+       case STORAGE_KEY_WIFI_STATE_INT:
+               return VCONFKEY_WIFI_STATE;
+       case STORAGE_KEY_WECONN_ALL_CONNECTED:
+               return VCONFKEY_WECONN_ALL_CONNECTED;
+       case STORAGE_KEY_SAP_CONNECTION_TYPE:
+               return VCONFKEY_SAP_CONNECTION_TYPE;
+#ifdef PREPAID_SIM_APN_SUPPORT
+       case STORAGE_KEY_PDP_LAST_CONNECTED_CONTEXT_BOOL:
+               return VCONFKEY_TELEPHONY_PRIVATE_PDP_LAST_CONNECTED_CONTEXT;
+       case STORAGE_KEY_PDP_LAST_CONNECTED_CONTEXT_PROFILE_ID:
+               return VCONFKEY_TELEPHONY_PRIVATE_PDP_LAST_CONNECTED_CONTEXT_PROFILE_ID;
+       case STORAGE_KEY_TELEPHONY_LAST_CONNECTED_CONTEXT_PLMN:
+               return VCONFKEY_TELEPHONY_PRIVATE_PDP_LAST_CONNECTED_CONTEXT_PLMN;
 #endif
-               case STORAGE_KEY_CELLULAR_PKT_LAST_RCV:
-                       return VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV;
-#ifdef TIZEN_FEATURE_DSDS
-               case STORAGE_KEY_CELLULAR_PKT_LAST_RCV2:
-                       return VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2;
-#endif
-               case STORAGE_KEY_CELLULAR_PKT_LAST_SNT:
-                       return VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT;
-#ifdef TIZEN_FEATURE_DSDS
-               case STORAGE_KEY_CELLULAR_PKT_LAST_SNT2:
-                       return VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2;
-#endif
-               case STORAGE_KEY_LANGUAGE_SET:
-                       return VCONFKEY_LANGSET;
-               case STORAGE_KEY_FLIGHT_MODE_BOOL:
-                       return VCONFKEY_TELEPHONY_FLIGHT_MODE;
-               case STORAGE_KEY_TESTMODE_FAST_DORMANCY:
-                       return VCONFKEY_TESTMODE_FAST_DORMANCY;
-#ifdef TIZEN_FEATURE_DSDS
-               case STORAGE_KEY_TESTMODE_FAST_DORMANCY2:
-                       return VCONFKEY_TESTMODE_FAST_DORMANCY2;
-#endif
-               case STORAGE_KEY_IDLE_SCREEN_LAUNCHED:
-                       return VCONFKEY_IDLE_SCREEN_LAUNCHED;
-               case STORAGE_KEY_POWER_SAVING_MODE:
-                       return VCONFKEY_SETAPPL_PSMODE;
-               case STORAGE_KEY_SETAPPL_NETWORK_RESTRICT_MODE:
-                       return VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE;
-               case STORAGE_KEY_SETAPPL_MOBILE_DATA_POPUP_DONE_BOOL:
-                       return VCONFKEY_SETAPPL_MOBILE_DATA_POPUP_DONE;
-               case STORAGE_KEY_MSG_SERVER_READY_BOOL:
-                       return VCONFKEY_MSG_SERVER_READY;
-               case STORAGE_KEY_SETAPPL_STATE_DATA_ROAMING_APP_STATUS:
-                       return VCONFKEY_SETAPPL_STATE_DATA_ROAMING_APP_STATUS;
-               case STORAGE_KEY_TELEPHONY_PREFERRED_VOICE_SUBSCRIPTION:
-                       return VCONFKEY_TELEPHONY_PREFERRED_VOICE_SUBSCRIPTION;
-               case STORAGE_KEY_TELEPHONY_DUALSIM_DEFAULT_SERVICE_INT:
-                       return VCONFKEY_TELEPHONY_DB_DEFAULT_SUBS;
-               case STORAGE_KEY_WIFI_STATE_INT:
-                       return VCONFKEY_WIFI_STATE;
-               case STORAGE_KEY_WECONN_ALL_CONNECTED:
-                       return VCONFKEY_WECONN_ALL_CONNECTED;
-               case STORAGE_KEY_SAP_CONNECTION_TYPE:
-                       return VCONFKEY_SAP_CONNECTION_TYPE;
-               default:
-                       break;
+       default:
+       break;
        }
 
        return NULL;
 }
 
-static enum tcore_storage_key convert_vconf_to_strgkey(const gchar* key)
+static enum tcore_storage_key convert_vconf_to_strgkey(const char *key)
 {
-       if (g_str_equal(key, VCONFKEY_TELEPHONY_PLMN) == TRUE) {
+       if (g_str_equal(key, VCONFKEY_TELEPHONY_PLMN) == TRUE)
                return STORAGE_KEY_TELEPHONY_PLMN;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_LAC) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_LAC) == TRUE)
                return STORAGE_KEY_TELEPHONY_LAC;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_CELLID) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_CELLID) == TRUE)
                return STORAGE_KEY_TELEPHONY_CELLID;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SVCTYPE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SVCTYPE) == TRUE)
                return STORAGE_KEY_TELEPHONY_SVCTYPE;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SVC_CS) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SVC_CS) == TRUE)
                return STORAGE_KEY_TELEPHONY_SVC_CS;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SVC_PS) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SVC_PS) == TRUE)
                return STORAGE_KEY_TELEPHONY_SVC_PS;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SVC_ROAM) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SVC_ROAM) == TRUE)
                return STORAGE_KEY_TELEPHONY_SVC_ROAM;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_PB_INIT) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_PB_INIT) == TRUE)
                return STORAGE_KEY_TELEPHONY_SIM_PB_INIT;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_CALL_FORWARD_STATE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_CALL_FORWARD_STATE) == TRUE)
                return STORAGE_KEY_TELEPHONY_CALL_FORWARD_STATE;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_TAPI_STATE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_TAPI_STATE) == TRUE)
                return STORAGE_KEY_TELEPHONY_TAPI_STATE;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SPN_DISP_CONDITION) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SPN_DISP_CONDITION) == TRUE)
                return STORAGE_KEY_TELEPHONY_SPN_DISP_CONDITION;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_RSSI) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_RSSI) == TRUE)
                return STORAGE_KEY_TELEPHONY_RSSI;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_READY) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_READY) == TRUE)
                return STORAGE_KEY_TELEPHONY_READY;
-       }
-       else if (g_str_equal(key, VCONFKEY_3G_ENABLE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_3G_ENABLE) == TRUE)
                return STORAGE_KEY_3G_ENABLE;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_DB_DEFAULT_DATA_SUBS) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_DB_DEFAULT_DATA_SUBS) == TRUE)
                return STORAGE_KEY_TELEPHONY_DUALSIM_DEFAULT_DATA_SERVICE_INT;
-       }
-       else if (g_str_equal(key, VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL) == TRUE)
                return STORAGE_KEY_SETAPPL_STATE_DATA_ROAMING_BOOL;
-       }
-       else if (g_str_equal(key, VCONFKEY_PM_STATE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_PM_STATE) == TRUE)
                return STORAGE_KEY_PM_STATE;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_SLOT) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_SLOT) == TRUE)
                return STORAGE_KEY_TELEPHONY_SIM_SLOT;
-       }
-#ifdef TIZEN_FEATURE_DSDS
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_SLOT2) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_SLOT2) == TRUE)
                return STORAGE_KEY_TELEPHONY_SIM_SLOT2;
-       }
-#endif
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_SLOT_COUNT) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_SLOT_COUNT) == TRUE)
                return STORAGE_KEY_TELEPHONY_SIM_SLOT_COUNT;
-       }
-       else if (g_str_equal(key, VCONFKEY_DNET_STATE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_DNET_STATE) == TRUE)
                return STORAGE_KEY_PACKET_SERVICE_STATE;
-       }
-#ifdef TIZEN_FEATURE_DSDS
-       else if (g_str_equal(key, VCONFKEY_DNET_STATE2) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_DNET_STATE2) == TRUE)
                return STORAGE_KEY_PACKET_SERVICE_STATE2;
-       }
-#endif
-       else if (g_str_equal(key, VCONFKEY_PACKET_STATE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_PACKET_STATE) == TRUE)
                return STORAGE_KEY_PACKET_INDICATOR_STATE;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_NWNAME) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_NWNAME) == TRUE)
                return STORAGE_KEY_TELEPHONY_NWNAME;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SPN_NAME) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SPN_NAME) == TRUE)
                return STORAGE_KEY_TELEPHONY_SPN_NAME;
-       }
-       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_STATE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_STATE) == TRUE)
                return STORAGE_KEY_CELLULAR_STATE;
-       }
-       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV) == TRUE)
                return STORAGE_KEY_CELLULAR_PKT_TOTAL_RCV;
-       }
-#ifdef TIZEN_FEATURE_DSDS
-       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV2) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV2) == TRUE)
                return STORAGE_KEY_CELLULAR_PKT_TOTAL_RCV2;
-       }
-#endif
-       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT) == TRUE)
                return STORAGE_KEY_CELLULAR_PKT_TOTAL_SNT;
-       }
-#ifdef TIZEN_FEATURE_DSDS
-       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT2) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT2) == TRUE)
                return STORAGE_KEY_CELLULAR_PKT_TOTAL_SNT2;
-       }
-#endif
-       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV) == TRUE)
                return STORAGE_KEY_CELLULAR_PKT_LAST_RCV;
-       }
-#ifdef TIZEN_FEATURE_DSDS
-       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2) == TRUE)
                return STORAGE_KEY_CELLULAR_PKT_LAST_RCV2;
-       }
-#endif
-       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT) == TRUE)
                return STORAGE_KEY_CELLULAR_PKT_LAST_SNT;
-       }
-#ifdef TIZEN_FEATURE_DSDS
-       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2) == TRUE)
                return STORAGE_KEY_CELLULAR_PKT_LAST_SNT2;
-       }
-#endif
-       else if (g_str_equal(key, VCONFKEY_LANGSET) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_LANGSET) == TRUE)
                return STORAGE_KEY_LANGUAGE_SET;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_FLIGHT_MODE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_FLIGHT_MODE) == TRUE)
                return STORAGE_KEY_FLIGHT_MODE_BOOL;
-       }
-       else if (g_str_equal(key, VCONFKEY_TESTMODE_FAST_DORMANCY) == TRUE) {
+#ifdef TIZEN_FEATURE_FAST_DORMANCY_ENABLE
+       else if (g_str_equal(key, VCONFKEY_TESTMODE_FAST_DORMANCY) == TRUE)
                return STORAGE_KEY_TESTMODE_FAST_DORMANCY;
-       }
-#ifdef TIZEN_FEATURE_DSDS
-       else if (g_str_equal(key, VCONFKEY_TESTMODE_FAST_DORMANCY2) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TESTMODE_FAST_DORMANCY2) == TRUE)
                return STORAGE_KEY_TESTMODE_FAST_DORMANCY2;
-       }
 #endif
-       else if (g_str_equal(key, VCONFKEY_IDLE_SCREEN_LAUNCHED) == TRUE) {
-               return STORAGE_KEY_IDLE_SCREEN_LAUNCHED;
-       }
-       else if (g_str_equal(key, VCONFKEY_SETAPPL_PSMODE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_SETAPPL_PSMODE) == TRUE)
                return STORAGE_KEY_POWER_SAVING_MODE;
-       }
-       else if (g_str_equal(key, VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE) == TRUE)
                return STORAGE_KEY_SETAPPL_NETWORK_RESTRICT_MODE;
-       }
-       else if (g_str_equal(key, VCONFKEY_SETAPPL_MOBILE_DATA_POPUP_DONE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_SETAPPL_MOBILE_DATA_POPUP_DONE) == TRUE)
                return STORAGE_KEY_SETAPPL_MOBILE_DATA_POPUP_DONE_BOOL;
-       }
-       else if (g_str_equal(key, VCONFKEY_MSG_SERVER_READY) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_MSG_SERVER_READY) == TRUE)
                return STORAGE_KEY_MSG_SERVER_READY_BOOL;
-       }
-       else if (g_str_equal(key, VCONFKEY_SETAPPL_STATE_DATA_ROAMING_APP_STATUS) == TRUE) {
-               return STORAGE_KEY_SETAPPL_STATE_DATA_ROAMING_APP_STATUS;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_PREFERRED_VOICE_SUBSCRIPTION) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_PREFERRED_VOICE_SUBSCRIPTION) == TRUE)
                return STORAGE_KEY_TELEPHONY_PREFERRED_VOICE_SUBSCRIPTION;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_DB_DEFAULT_SUBS) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_DB_DEFAULT_SUBS) == TRUE)
                return STORAGE_KEY_TELEPHONY_DUALSIM_DEFAULT_SERVICE_INT;
-       }
-       else if (g_str_equal(key, VCONFKEY_WIFI_STATE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_WIFI_STATE) == TRUE)
                return STORAGE_KEY_WIFI_STATE_INT;
-       }
-       else if(g_str_equal(key, VCONFKEY_WECONN_ALL_CONNECTED) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_WECONN_ALL_CONNECTED) == TRUE)
                return STORAGE_KEY_WECONN_ALL_CONNECTED;
-       }
-       else if(g_str_equal(key, VCONFKEY_SAP_CONNECTION_TYPE) == TRUE) {
+       else if (g_str_equal(key, VCONFKEY_SAP_CONNECTION_TYPE) == TRUE)
                return STORAGE_KEY_SAP_CONNECTION_TYPE;
-       }
+#ifdef PREPAID_SIM_APN_SUPPORT
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_PRIVATE_PDP_LAST_CONNECTED_CONTEXT) == TRUE)
+               return STORAGE_KEY_PDP_LAST_CONNECTED_CONTEXT_BOOL;
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_PRIVATE_PDP_LAST_CONNECTED_CONTEXT_PROFILE_ID) == TRUE)
+               return STORAGE_KEY_PDP_LAST_CONNECTED_CONTEXT_PROFILE_ID;
+       else if (g_str_equal(key, VCONFKEY_TELEPHONY_PRIVATE_PDP_LAST_CONNECTED_CONTEXT_PLMN) == TRUE)
+               return STORAGE_KEY_TELEPHONY_LAST_CONNECTED_CONTEXT_PLMN;
+#endif
 
        return 0;
 }
 
-static voidcreate_handle(Storage *strg, const char *path)
+static void *create_handle(Storage *strg, const char *path)
 {
        void *tmp = NULL;
-       if(!strg)
+       if (!strg)
                return NULL;
 
        tmp = malloc(sizeof(char));
@@ -447,7 +368,7 @@ static void* create_handle(Storage *strg, const char *path)
 
 static gboolean remove_handle(Storage *strg, void *handle)
 {
-       if(!strg || !handle)
+       if (!strg || !handle)
                return FALSE;
 
        free(handle);
@@ -461,10 +382,10 @@ static gboolean set_int(Storage *strg, enum tcore_storage_key key, int value)
        if (!strg)
                return FALSE;
 
-       if(key & STORAGE_KEY_INT)
+       if (key & STORAGE_KEY_INT)
                s_key = convert_strgkey_to_vconf(key);
 
-       if(!s_key)
+       if (!s_key)
                return FALSE;
 
        if (vconf_set_int(s_key, value) == 0)
@@ -480,10 +401,10 @@ static gboolean set_bool(Storage *strg, enum tcore_storage_key key, gboolean val
        if (!strg)
                return FALSE;
 
-       if(key & STORAGE_KEY_BOOL)
+       if (key & STORAGE_KEY_BOOL)
                s_key = convert_strgkey_to_vconf(key);
 
-       if(!s_key)
+       if (!s_key)
                return FALSE;
 
        vconf_set_bool(s_key, value);
@@ -497,10 +418,10 @@ static gboolean set_string(Storage *strg, enum tcore_storage_key key, const char
        if (!strg)
                return FALSE;
 
-       if(key & STORAGE_KEY_STRING)
+       if (key & STORAGE_KEY_STRING)
                s_key = convert_strgkey_to_vconf(key);
 
-       if(!s_key)
+       if (!s_key)
                return FALSE;
 
        vconf_set_str(s_key, value);
@@ -515,10 +436,10 @@ static int get_int(Storage *strg, enum tcore_storage_key key)
        if (!strg)
                return value;
 
-       if(key & STORAGE_KEY_INT)
+       if (key & STORAGE_KEY_INT)
                s_key = convert_strgkey_to_vconf(key);
 
-       if(s_key != NULL)
+       if (s_key != NULL)
                vconf_get_int(s_key, &value);
 
        return value;
@@ -532,10 +453,10 @@ static gboolean get_bool(Storage *strg, enum tcore_storage_key key)
        if (!strg)
                return value;
 
-       if(key & STORAGE_KEY_BOOL)
+       if (key & STORAGE_KEY_BOOL)
                s_key = convert_strgkey_to_vconf(key);
 
-       if(s_key != NULL)
+       if (s_key != NULL)
                vconf_get_bool(s_key, &value);
 
        return value;
@@ -548,16 +469,16 @@ static char *get_string(Storage *strg, enum tcore_storage_key key)
        if (!strg)
                return NULL;
 
-       if(key & STORAGE_KEY_STRING)
+       if (key & STORAGE_KEY_STRING)
                s_key = convert_strgkey_to_vconf(key);
 
-       if(s_key != NULL)
+       if (s_key != NULL)
                return vconf_get_str(s_key);
 
        return NULL;
 }
 
-static void __vconfkey_callback(keynode_t* node, void* data)
+static void __vconfkey_callback(keynode_t *node, void *data)
 {
        int type = 0;
        const char *vkey = NULL;
@@ -568,34 +489,32 @@ static void __vconfkey_callback(keynode_t* node, void* data)
        strg = (Storage *)data;
        vkey = vconf_keynode_get_name(node);
        type = vconf_keynode_get_type(node);
-       s_key = convert_vconf_to_strgkey(vkey);
+       if (vkey != NULL)
+               s_key = convert_vconf_to_strgkey(vkey);
 
-       if(type == VCONF_TYPE_STRING){
+       if (type == VCONF_TYPE_STRING) {
                gchar *tmp;
-               tmp = (gchar *)vconf_keynode_get_str(node);
-               value = g_variant_new_string( tmp );
-       }
-       else if(type == VCONF_TYPE_INT){
+               tmp = (char *)vconf_keynode_get_str(node);
+               value = g_variant_new_string(tmp);
+       } else if (type == VCONF_TYPE_INT) {
                gint32 tmp = 0;
                tmp = vconf_keynode_get_int(node);
-               value = g_variant_new_int32( tmp );
-       }
-       else if(type == VCONF_TYPE_DOUBLE){
+               value = g_variant_new_int32(tmp);
+       } else if (type == VCONF_TYPE_DOUBLE) {
                gdouble tmp = 0;
                tmp = vconf_keynode_get_dbl(node);
-               value = g_variant_new_double( tmp );
-       }
-       else if(type == VCONF_TYPE_BOOL){
+               value = g_variant_new_double(tmp);
+       } else if (type == VCONF_TYPE_BOOL) {
                gboolean tmp = FALSE;
                tmp = vconf_keynode_get_bool(node);
-               value = g_variant_new_boolean( tmp );
+               value = g_variant_new_boolean(tmp);
        }
 
 
-       if(callback_dispatch != NULL)
+       if (callback_dispatch != NULL)
                callback_dispatch(strg, s_key, value);
 
-       if(value)
+       if (value)
                g_variant_unref(value);
 
        return;
@@ -611,10 +530,10 @@ static gboolean set_key_callback(Storage *strg, enum tcore_storage_key key, Tcor
        s_key = convert_strgkey_to_vconf(key);
        dbg("s_key (%s)", s_key);
 
-       if(s_key == NULL)
+       if (s_key == NULL)
                return FALSE;
 
-       if(callback_dispatch == NULL)
+       if (callback_dispatch == NULL)
                callback_dispatch = cb;
 
        vconf_notify_key_changed(s_key, __vconfkey_callback, strg);
@@ -631,7 +550,7 @@ static gboolean remove_key_callback(Storage *strg, enum tcore_storage_key key)
        s_key = convert_strgkey_to_vconf(key);
        dbg("s_key (%s)", s_key);
 
-       if(s_key == NULL)
+       if (s_key == NULL)
                return FALSE;
 
        vconf_ignore_key_changed(s_key, __vconfkey_callback);
@@ -675,61 +594,60 @@ static void _update_vconf_network_name(CoreObject *o)
 
        tcore_network_get_network_name_priority(o, &network_name_priority);
        switch (network_name_priority) {
-               case TCORE_NETWORK_NAME_PRIORITY_SPN:
-                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_SPN);
-                       break;
+       case TCORE_NETWORK_NAME_PRIORITY_SPN:
+               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_SPN);
+       break;
 
-               case TCORE_NETWORK_NAME_PRIORITY_NETWORK:
-                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_PLMN);
-                       break;
+       case TCORE_NETWORK_NAME_PRIORITY_NETWORK:
+               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_PLMN);
+       break;
 
-               case TCORE_NETWORK_NAME_PRIORITY_ANY:
-                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_SPN_PLMN);
-                       break;
+       case TCORE_NETWORK_NAME_PRIORITY_ANY:
+               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_SPN_PLMN);
+       break;
 
-               default:
-                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_INVALID);
-                       break;
+       default:
+               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_INVALID);
+       break;
        }
 
        switch (svc_type) {
-               case NETWORK_SERVICE_TYPE_UNKNOWN:
-               case NETWORK_SERVICE_TYPE_NO_SERVICE:
-               case NETWORK_SERVICE_TYPE_EMERGENCY:
-               case NETWORK_SERVICE_TYPE_SEARCH:
+       case NETWORK_SERVICE_TYPE_UNKNOWN:
+       case NETWORK_SERVICE_TYPE_NO_SERVICE:
+       case NETWORK_SERVICE_TYPE_EMERGENCY:
+       case NETWORK_SERVICE_TYPE_SEARCH:
+       break;
+
+       default:
+               /* spn */
+               spnname = tcore_network_get_network_name(o, TCORE_NETWORK_NAME_TYPE_SPN);
+               if (spnname)
+                       __vconf_check_and_set_str(VCONFKEY_TELEPHONY_SPN_NAME, spnname);
+
+               /* nitz */
+               nwname = tcore_network_get_network_name(o, TCORE_NETWORK_NAME_TYPE_FULL);
+               if (nwname && strlen(nwname) > 0) {
+                       dbg("SPN:[%s] FULL:[%s] prio:[%d] act:[%d] svc_type:[%d]",
+                                       spnname ? spnname : "", nwname, network_name_priority, svc_act, svc_type);
+                       __vconf_check_and_set_str(VCONFKEY_TELEPHONY_NWNAME, nwname);
                        break;
-
-               default:
-                       /* spn */
-                       spnname = tcore_network_get_network_name(o, TCORE_NETWORK_NAME_TYPE_SPN);
-                       if (spnname) {
-                               __vconf_check_and_set_str(VCONFKEY_TELEPHONY_SPN_NAME, spnname);
-                       }
-
-                       /* nitz */
-                       nwname = tcore_network_get_network_name(o, TCORE_NETWORK_NAME_TYPE_FULL);
-                       if (nwname && strlen(nwname) > 0) {
-                               dbg("SPN:[%s] FULL:[%s] prio:[%d] act:[%d] svc_type:[%d]",
-                                               spnname?spnname:"", nwname, network_name_priority, svc_act, svc_type);
+               } else {
+                       if (nwname)
+                               free(nwname);
+                       nwname = tcore_network_get_network_name(o, TCORE_NETWORK_NAME_TYPE_SHORT);
+                       if (nwname) {
+                               dbg("SPN:[%s] SHORT:[%s] prio:[%d] act:[%d] svc_type:[%d]",
+                                       spnname ? spnname : "", nwname, network_name_priority, svc_act, svc_type);
                                __vconf_check_and_set_str(VCONFKEY_TELEPHONY_NWNAME, nwname);
                                break;
                        }
-                       else {
-                               if (nwname)
-                                       free(nwname);
-                               nwname = tcore_network_get_network_name(o, TCORE_NETWORK_NAME_TYPE_SHORT);
-                               if (nwname) {
-                                       dbg("SPN:[%s] SHORT:[%s] prio:[%d] act:[%d] svc_type:[%d]",
-                                               spnname?spnname:"", nwname, network_name_priority, svc_act, svc_type);
-                                       __vconf_check_and_set_str(VCONFKEY_TELEPHONY_NWNAME, nwname);
-                                       break;
-                               }
-                       }
-                       dbg("name is not fixed yet. SPN:[%s] prio:[%d] act:[%d] svc_type:[%d]",
-                               spnname?spnname:"", network_name_priority, svc_act, svc_type);
+               }
+               dbg("name is not fixed yet. SPN:[%s] prio:[%d] act:[%d] svc_type:[%d]",
+                       spnname ? spnname : "", network_name_priority, svc_act, svc_type);
 
-                       break;
+       break;
        }
+
        if (spnname)
                free(spnname);
 
@@ -737,7 +655,8 @@ static void _update_vconf_network_name(CoreObject *o)
                free(nwname);
 }
 
-static enum tcore_hook_return on_hook_network_location_cellinfo(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_network_location_cellinfo(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_network_location_cellinfo *info = data;
 
@@ -758,7 +677,8 @@ static enum tcore_hook_return on_hook_network_location_cellinfo(Server *s, CoreO
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_network_icon_info(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_network_icon_info(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_network_icon_info *info = data;
 
@@ -773,25 +693,24 @@ static enum tcore_hook_return on_hook_network_icon_info(Server *s, CoreObject *s
                return TCORE_HOOK_RETURN_CONTINUE;
        }
 #ifdef TIZEN_FEATURE_CDMA
-       if(info->type & NETWORK_ICON_INFO_ROAM_ICON_MODE) {
+       if (info->type & NETWORK_ICON_INFO_ROAM_ICON_MODE)
                __vconf_check_and_set_int(VCONFKEY_TELEPHONY_ROAM_ICON_MODE, info->roam_icon_mode);
-       }
 #endif
-       if(info->type & NETWORK_ICON_INFO_RSSI) {
+       if (info->type & NETWORK_ICON_INFO_RSSI)
                __vconf_check_and_set_int(VCONFKEY_TELEPHONY_RSSI, info->rssi);
-       }
 
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_network_registration_status(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_network_registration_status(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_network_registration_status *info = data;
        int status;
        gboolean roaming_allowed;
 
        warn("vconf set (cs:[%d] ps:[%d] svctype:[%d] roam:[%d])",
-               info->cs_domain_status,info->ps_domain_status,info->service_type,info->roaming_status);
+               info->cs_domain_status, info->ps_domain_status, info->service_type, info->roaming_status);
 
        /*
         * Backward compatibility for Single SIM (Primary Subscription ONLY)
@@ -828,10 +747,10 @@ static enum tcore_hook_return on_hook_network_registration_status(Server *s, Cor
        _update_vconf_network_name(source);
 
        vconf_get_bool(VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL, &roaming_allowed);
-       if(info->service_type > NETWORK_SERVICE_TYPE_SEARCH && !roaming_allowed && info->roaming_status) {
+       if (info->service_type > NETWORK_SERVICE_TYPE_SEARCH && !roaming_allowed && info->roaming_status) {
                int pkg_state;
                vconf_get_int(VCONFKEY_DNET_STATE, &pkg_state);
-               if(pkg_state > 0) {
+               if (pkg_state > 0) {
                        dbg("Mismatch: hide PS icon.");
                        __vconf_check_and_set_int(VCONFKEY_DNET_STATE, VCONFKEY_DNET_OFF);
                }
@@ -839,7 +758,8 @@ static enum tcore_hook_return on_hook_network_registration_status(Server *s, Cor
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_network_change(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_network_change(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_network_change *info = data;
 
@@ -864,7 +784,8 @@ static enum tcore_hook_return on_hook_network_change(Server *s, CoreObject *sour
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_network_identity(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_network_identity(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_network_identity *info = data;
 
@@ -888,16 +809,18 @@ static enum tcore_hook_return on_hook_network_identity(Server *s, CoreObject *so
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_network_default_data_subs (Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_network_default_data_subs(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_network_default_data_subs *info = data;
 
        msg("vconf set (default data subs:[%d])", info->default_subs);
-       __vconf_check_and_set_int( VCONFKEY_TELEPHONY_DB_DEFAULT_DATA_SUBS, info->default_subs);
+       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_DB_DEFAULT_DATA_SUBS, info->default_subs);
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_sim_init(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_sim_init(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_sim_status *sim  = data;
        const char *cp_name;
@@ -907,11 +830,11 @@ static enum tcore_hook_return on_hook_sim_init(Server *s, CoreObject *source, en
        dbg("CP name: [%s]", cp_name);
 
        if (cp_name != NULL) {
-               if (g_str_has_suffix(cp_name, "0"))
+               if (g_str_has_suffix(cp_name, "0")) {
                        slot = 0;
-               else if (g_str_has_suffix(cp_name, "1"))
+               } else if (g_str_has_suffix(cp_name, "1")) {
                        slot = 1;
-               else {
+               else {
                        err("Vconf keys are not supported for this CP name");
                        return TCORE_HOOK_RETURN_CONTINUE;
                }
@@ -919,66 +842,60 @@ static enum tcore_hook_return on_hook_sim_init(Server *s, CoreObject *source, en
                err("CP Name is NULL");
                return TCORE_HOOK_RETURN_CONTINUE;
        }
+
        warn("vconf set (sim_status = %d), slot - (%d)", sim->sim_status, slot);
 
        __vconf_check_and_set_int(VCONFKEY_TELEPHONY_SIM_STATUS, sim->sim_status);
 
        switch (sim->sim_status) {
-               case SIM_STATUS_CARD_ERROR:
-               case SIM_STATUS_CARD_CRASHED:
-                       if (slot == 0)
-                               vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_CARD_ERROR);
-#ifdef TIZEN_FEATURE_DSDS
-                       else
-                               vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT2, VCONFKEY_TELEPHONY_SIM_CARD_ERROR);
-#endif
-                       __vconf_check_and_set_str(VCONFKEY_TELEPHONY_NWNAME, "SIM Error");
-                       break;
-
-               case SIM_STATUS_CARD_NOT_PRESENT:
-               case SIM_STATUS_CARD_REMOVED:
-                       if (slot == 0)
-                               vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_NOT_PRESENT);
-#ifdef TIZEN_FEATURE_DSDS
-                       else
-                               vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT2, VCONFKEY_TELEPHONY_SIM_NOT_PRESENT);
-#endif
-                       __vconf_check_and_set_str(VCONFKEY_TELEPHONY_NWNAME, "NO SIM");
-                       break;
-
-               case SIM_STATUS_INIT_COMPLETED:
-               case SIM_STATUS_INITIALIZING:
-               case SIM_STATUS_PIN_REQUIRED:
-               case SIM_STATUS_PUK_REQUIRED:
-               case SIM_STATUS_LOCK_REQUIRED:
-               case SIM_STATUS_CARD_BLOCKED:
-               case SIM_STATUS_NCK_REQUIRED:
-               case SIM_STATUS_NSCK_REQUIRED:
-               case SIM_STATUS_SPCK_REQUIRED:
-               case SIM_STATUS_CCK_REQUIRED:
-                       if (slot == 0)
-                               vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_INSERTED);
-#ifdef TIZEN_FEATURE_DSDS
-                       else
-                               vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT2, VCONFKEY_TELEPHONY_SIM_INSERTED);
-#endif
-                       break;
-
-               case SIM_STATUS_UNKNOWN:
-               default:
-                       if (slot == 0)
-                               vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_UNKNOWN);
-#ifdef TIZEN_FEATURE_DSDS
-                       else
-                               vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT2, VCONFKEY_TELEPHONY_SIM_UNKNOWN);
-#endif
-                       break;
+       case SIM_STATUS_CARD_ERROR:
+       case SIM_STATUS_CARD_CRASHED:
+               if (slot == 0)
+                       vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_CARD_ERROR);
+               else
+                       vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT2, VCONFKEY_TELEPHONY_SIM_CARD_ERROR);
+               __vconf_check_and_set_str(VCONFKEY_TELEPHONY_NWNAME, "SIM Error");
+       break;
+
+       case SIM_STATUS_CARD_NOT_PRESENT:
+       case SIM_STATUS_CARD_REMOVED:
+               if (slot == 0)
+                       vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_NOT_PRESENT);
+               else
+                       vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT2, VCONFKEY_TELEPHONY_SIM_NOT_PRESENT);
+               __vconf_check_and_set_str(VCONFKEY_TELEPHONY_NWNAME, "NO SIM");
+       break;
+
+       case SIM_STATUS_INIT_COMPLETED:
+       case SIM_STATUS_INITIALIZING:
+       case SIM_STATUS_PIN_REQUIRED:
+       case SIM_STATUS_PUK_REQUIRED:
+       case SIM_STATUS_LOCK_REQUIRED:
+       case SIM_STATUS_CARD_BLOCKED:
+       case SIM_STATUS_NCK_REQUIRED:
+       case SIM_STATUS_NSCK_REQUIRED:
+       case SIM_STATUS_SPCK_REQUIRED:
+       case SIM_STATUS_CCK_REQUIRED:
+               if (slot == 0)
+                       vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_INSERTED);
+               else
+                       vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT2, VCONFKEY_TELEPHONY_SIM_INSERTED);
+       break;
+
+       case SIM_STATUS_UNKNOWN:
+       default:
+               if (slot == 0)
+                       vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_UNKNOWN);
+               else
+                       vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT2, VCONFKEY_TELEPHONY_SIM_UNKNOWN);
+       break;
        }
 
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_pb_init(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_pb_init(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_phonebook_status *pb  = data;
 
@@ -1002,7 +919,7 @@ static enum tcore_hook_return on_hook_pb_init(Server *s, CoreObject *source, enu
 }
 
 static enum tcore_hook_return on_hook_ps_protocol_status(Server *s, CoreObject *source,
-               enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        enum telephony_network_service_type svc_type;
        const struct tnoti_ps_protocol_status *noti = data;
@@ -1028,33 +945,36 @@ static enum tcore_hook_return on_hook_ps_protocol_status(Server *s, CoreObject *
        }
 
        switch (noti->status) {
-               case TELEPHONY_HSDPA_OFF:
-                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_NONE);
-                       break;
+       case TELEPHONY_HSDPA_OFF:
+               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_NONE);
+       break;
 
-               case TELEPHONY_HSDPA_ON:
-                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSDPA);
-                       break;
+       case TELEPHONY_HSDPA_ON:
+               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSDPA);
+       break;
 
-               case TELEPHONY_HSUPA_ON:
-                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSUPA);
-                       break;
+       case TELEPHONY_HSUPA_ON:
+               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSUPA);
+       break;
 
-               case TELEPHONY_HSPA_ON:
-                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSPA);
-                       break;
-               case TELEPHONY_HSPAP_ON:
-                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSPAP);
-                       break;
-               default:
-                       warn("invalid ps status");
-                       break;
+       case TELEPHONY_HSPA_ON:
+               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSPA);
+       break;
+
+       case TELEPHONY_HSPAP_ON:
+               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_PSTYPE, VCONFKEY_TELEPHONY_PSTYPE_HSPAP);
+       break;
+
+       default:
+               warn("invalid ps status");
+       break;
        }
 
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_modem_flight_mode(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_modem_flight_mode(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_modem_flight_mode *flight_mode = data;
        struct vconf_plugin_user_data *ud = user_data;
@@ -1089,7 +1009,8 @@ static enum tcore_hook_return on_hook_modem_flight_mode(Server *s, CoreObject *s
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_modem_power(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_modem_power(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        const struct tnoti_modem_power *power = data;
        struct vconf_plugin_user_data *ud = user_data;
@@ -1117,17 +1038,18 @@ static enum tcore_hook_return on_hook_modem_power(Server *s, CoreObject *source,
                info("cp crash : all network setting will be reset");
                reset_vconf();
        } else if (power->state == MODEM_STATE_LOW) {
-               vconf_set_bool(VCOKFKEY_TELEPHONY_MODEM_STATE, FALSE);
+               vconf_set_bool(VCONFKEY_TELEPHONY_PRIVATE_MODEM_STATE, FALSE);
                __vconf_write_power_status_log(ud, MODEM_STATE_LOW);
        } else if (power->state == MODEM_STATE_ONLINE) {
-               vconf_set_bool(VCOKFKEY_TELEPHONY_MODEM_STATE, TRUE);
+               vconf_set_bool(VCONFKEY_TELEPHONY_PRIVATE_MODEM_STATE, TRUE);
                __vconf_write_power_status_log(ud, MODEM_STATE_ONLINE);
        }
 
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
-static enum tcore_hook_return on_hook_bootup_complete(Server *s, CoreObject *source, enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
+static enum tcore_hook_return on_hook_bootup_complete(Server *s, CoreObject *source,
+       enum tcore_notification_command command, unsigned int data_len, void *data, void *user_data)
 {
        info("tapi ready");
        vconf_set_int(VCONFKEY_TELEPHONY_TAPI_STATE, VCONFKEY_TELEPHONY_TAPI_STATE_READY);
@@ -1135,6 +1057,17 @@ static enum tcore_hook_return on_hook_bootup_complete(Server *s, CoreObject *sou
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
+static enum tcore_hook_return on_hook_modem_plugin_removed(Server *s,
+       CoreObject *source, enum tcore_notification_command command,
+       unsigned int data_len, void *data, void *user_data)
+{
+       dbg("vconf (Modem Plugin Removed!!!)");
+
+       reset_vconf();
+
+       return TCORE_HOOK_RETURN_CONTINUE;
+}
+
 static void reset_vconf()
 {
        vconf_set_str(VCONFKEY_TELEPHONY_NWNAME, "");
@@ -1158,9 +1091,7 @@ static void reset_vconf()
        vconf_set_int(VCONFKEY_TELEPHONY_NITZ_EVENT_GMT, 0);
        vconf_set_str(VCONFKEY_TELEPHONY_NITZ_ZONE, "");
 
-#ifdef TIZEN_FEATURE_DSDS
        vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT2, VCONFKEY_TELEPHONY_SIM_UNKNOWN);
-#endif
 }
 
 static gboolean on_load()
@@ -1217,7 +1148,9 @@ static gboolean on_init(TcorePlugin *p)
        tcore_server_add_notification_hook(s, TNOTI_MODEM_BOOTUP, on_hook_bootup_complete, ud);
        tcore_server_add_notification_hook(s, TNOTI_MODEM_FLIGHT_MODE, on_hook_modem_flight_mode, ud);
        tcore_server_add_notification_hook(s, TNOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION, on_hook_network_default_data_subs, strg);
+       tcore_server_add_notification_hook(s, TNOTI_SERVER_REMOVED_MODEM_PLUGIN, on_hook_modem_plugin_removed, strg);
        vconf_notify_key_changed(VCONFKEY_TELEPHONY_READY, __telephony_ready_change_cb, NULL);
+
        return TRUE;
 }
 
@@ -1232,9 +1165,8 @@ static void on_unload(TcorePlugin *p)
        dbg("i'm unload");
 
        ud = tcore_plugin_ref_user_data(p);
-       if(ud) {
+       if (ud)
                free(ud);
-       }
 
        strg = tcore_server_find_storage(tcore_plugin_ref_server(p), "vconf");
        if (!strg)
@@ -1243,8 +1175,7 @@ static void on_unload(TcorePlugin *p)
        tcore_storage_free(strg);
 }
 
-EXPORT_API struct tcore_plugin_define_desc plugin_define_desc =
-{
+EXPORT_API struct tcore_plugin_define_desc plugin_define_desc = {
        .name = "VCONF_STORAGE",
        .priority = TCORE_PLUGIN_PRIORITY_HIGH - 1,
        .version = PLUGIN_VERSION,