Paths updated in setting-profile project

Change-Id: I0d43ea3276e116d959012d98b286e3232c469284
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-common/inc/setting-common-string.h b/setting-common/inc/setting-common-string.h
index bdc44aeb29b8570d56e03fbd76105fd9668f25cf..4e170266e82813415392cbc353477f68e825a343 100755 (executable)
--- a/setting-common/inc/setting-common-string.h
+++ b/setting-common/inc/setting-common-string.h
@@ -35,10 +35,8 @@
 #define SETTING_LIST_ICON_PATH_CFG SETTING_ICON_PATH_CFG"list_icon/"
 #define SETTING_IMAGE_PATH_CFG "/images/"
 
-#define SETTING_DEFAULT_CALL_TONE \
-       _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
-#define SETTING_DEFAULT_CALL_TONE_SDK \
-       _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
+#define SETTING_DEFAULT_CALL_TONE "media/settings/Ringtones/ringtone_sdk.mp3"
+#define SETTING_DEFAULT_CALL_TONE_SDK "media/settings/Ringtones/ringtone_sdk.mp3"
 
 
 #define KeyStr_Emulator                "Emulator"

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index a6011cedb796aa3c9d1fef1a851ff72e34afb7c3..7891d1ce6347724ee91a202933b127a80042ef35 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -727,7 +727,7 @@ EXPORT_PUBLIC char *_get_default_font()
        struct _xmlAttr *properties = NULL;
        char *default_font_name = NULL;
 
-       const char *path = tzplatform_mkpath(TZ_SYS_RO_APP, SETTING_DEFAULT_FONT_CONF_FILE);
+       const char *path = tzplatform_mkpath(TZ_SYS_RO_APP, SETTING_DEFAULT_FONT_CONF_FILE); //TODO Check
        doc = xmlParseFile(path);
 
        cur = xmlDocGetRootElement(doc);
@@ -1008,11 +1008,3 @@ char *get_shared_path(char *name)
        free(data);
        return final_path;
 }
-
-EXPORT_PUBLIC
-char *get_globaluser_data(char *name)
-{
-
-
-}
-

diff --git a/setting-profile-common/.cproject b/setting-profile-common/.cproject
index cd54370c26aa2135fa10eedd9dc32da4e31433f9..b010890d02231806a68a220609a3c18d0aab79ca 100644 (file)
--- a/setting-profile-common/.cproject
+++ b/setting-profile-common/.cproject
@@ -377,6 +377,7 @@
                                                                        <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="setting-common"/>
                                                                        <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="vconf"/>
                                                                        <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="call-manager"/>
+                                                                       <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="tzplatform-config-2.0"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1247410231" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
                                                                        <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

diff --git a/setting-profile-common/inc/setting-profile-common.h b/setting-profile-common/inc/setting-profile-common.h
index 9b908b0aa9bc8966042e08a1b0a939e6fc03bbb4..780401f1afe9ce5780697411bdefb324e43d1498 100644 (file)
--- a/setting-profile-common/inc/setting-profile-common.h
+++ b/setting-profile-common/inc/setting-profile-common.h
@@ -32,24 +32,18 @@
 #include <setting-common-draw-widget.h>
 #include <setting-common-view.h>
 
-#define SETTING_PROFILE_ICON_PATH_CFG _TZ_SYS_RO_APP"/org.tizen.setting/res/icons/"
+#define SETTING_PROFILE_ICON_PATH_CFG "/icons/"
 
 #define VOLUME_APP_NAME "org.tizen.setting.volume"
-#define SETTING_PROFILE_MMC_PATH \
-       _TZ_SYS_MEDIA"/sdcard"
-#define SETTING_DEFAULT_MSG_TONE \
-       _TZ_SYS_GLOBALUSER_DATA"/settings/Alerts/Whistle.ogg"
-#define SETTING_DEFAULT_MEDIA_TONE \
-       _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
+#define SETTING_PROFILE_MMC_PATH "/sdcard"
+#define SETTING_DEFAULT_MSG_TONE "media/settings/Alerts/Whistle.ogg"
+#define SETTING_DEFAULT_MEDIA_TONE "media/settings/Ringtones/ringtone_sdk.mp3"
 #define SUPPORT_PLAYER_ASYNC 1
 
 /*Call ringtone:3 icon status */
-#define ICON_CALL_VIB \
-       SETTING_PROFILE_ICON_PATH_CFG"sound_slider_icon_volume_vibrate.png"
-#define ICON_CALL_NORMAL \
-       SETTING_PROFILE_ICON_PATH_CFG"sound_slider_icon_incoming_call.png"
-#define ICON_CALL_MUTE \
-       SETTING_PROFILE_ICON_PATH_CFG"sound_slider_icon_volume_mute.png"
+#define ICON_CALL_VIB SETTING_PROFILE_ICON_PATH_CFG"sound_slider_icon_volume_vibrate.png"
+#define ICON_CALL_NORMAL SETTING_PROFILE_ICON_PATH_CFG"sound_slider_icon_incoming_call.png"
+#define ICON_CALL_MUTE SETTING_PROFILE_ICON_PATH_CFG"sound_slider_icon_volume_mute.png"
 
 /*Notification: 2 icon status */
 #define ICON_NOTI_VIB \

diff --git a/setting-profile-common/src/setting-profile-common.c b/setting-profile-common/src/setting-profile-common.c
index b05384a5a5c8b3896056279246f3911a15861bc7..52661f79d0383ad042049de03beacc90e42d9ff5 100644 (file)
--- a/setting-profile-common/src/setting-profile-common.c
+++ b/setting-profile-common/src/setting-profile-common.c
@@ -25,9 +25,10 @@
 #include <metadata_extractor.h>
 #include <player.h>
 #include <setting-profile-common.h>
+#include <tzplatform_config.h>
 
-#define SETTING_DEFAULT_FOLDER_PATH    _TZ_SYS_GLOBALUSER_DATA"/settings/"
-#define SDCARD_PATH    _TZ_SYS_MEDIA"/sdcard/"
+#define SETTING_DEFAULT_FOLDER_PATH    "media/settings/"
+#define SDCARD_PATH    "/sdcard/"
 #define EXP 0.001
 
 typedef struct _SliderIcons {
@@ -102,32 +103,46 @@ char *setting_sound_get_slider_icon(int type, int volume)
                /*special process */
                int sound = 0;
                int vibration = 0;
+               char *icon_call = get_resource_path(ICON_CALL_NORMAL);
+               char *icon_noti = get_resource_path(ICON_NOTI_NORMAL);
                vconf_get_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, &sound);
-               vconf_get_bool(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL,
-                               &vibration);
+               vconf_get_bool(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, &vibration);
 
                if (sound && !vibration) {
-                       return (SND_SLIDER_CALL == type ?
-                                       ICON_CALL_NORMAL : ICON_NOTI_NORMAL);
+                       return (SND_SLIDER_CALL == type ? icon_call : icon_noti);
                }
 
+               icon_call = get_resource_path(ICON_CALL_VIB);
+               icon_noti = get_resource_path(ICON_NOTI_VIB);
+
                if (vibration && !sound) {
-                       return (SND_SLIDER_CALL == type ? ICON_CALL_VIB : ICON_NOTI_VIB);
+                       return (SND_SLIDER_CALL == type ? icon_call : icon_noti);
                }
 
+               icon_call = get_resource_path(ICON_CALL_MUTE);
+               icon_noti = get_resource_path(ICON_NOTI_MUTE);
+
                if (!vibration && !sound) {
-                       return (SND_SLIDER_CALL == type ? ICON_CALL_MUTE : ICON_NOTI_MUTE);
+                       return (SND_SLIDER_CALL == type ? icon_call : icon_noti);
                }
 
-               return (SND_SLIDER_CALL == type ?
-                               ICON_CALL_NORMAL : ICON_NOTI_NORMAL);
+               icon_call = get_resource_path(ICON_CALL_NORMAL);
+               icon_noti = get_resource_path(ICON_NOTI_NORMAL);
+
+               return (SND_SLIDER_CALL == type ? icon_call : icon_noti);
        }
 
+       char *path = get_resource_path(SETTING_ICON_PATH);
+       char *buf = calloc(PATH_MAX, sizeof(char));
+
        /* 2.Other types, just have two icon status */
-       if (volume > 0)
-               return slider_icons[type].volume;
-       else
-               return slider_icons[type].mute;
+       if (volume > 0) {
+               snprintf(buf, PATH_MAX, "%s/%s", path, slider_icons[type].volume);
+       } else {
+               snprintf(buf, PATH_MAX, "%s/%s", path, slider_icons[type].mute);
+       }
+
+       return buf;
 }
 
 EXPORT_PUBLIC
@@ -139,9 +154,9 @@ void setting_sound_update_slider_icon(Setting_GenGroupItem_Data *item_data,
 
        Evas_Object *icon = elm_object_content_get(item_data->eo_check);
        if (icon) {
-               char *new_file = setting_sound_get_slider_icon(type,
-                               item_data->chk_status);
+               char *new_file = setting_sound_get_slider_icon(type, item_data->chk_status);
                elm_image_file_set(icon, new_file, NULL);
+               free(new_file);
        }
 }
 
@@ -186,9 +201,9 @@ int setting_sound_check_file_exist(void *data, const char *file_path)
        retv_if(data == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
        retv_if(file_path == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       if (0 == safeStrNCmp(file_path,
-                       SETTING_DEFAULT_FOLDER_PATH,
-                       safeStrLen(SETTING_DEFAULT_FOLDER_PATH))) {
+       const char *tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_FOLDER_PATH);
+
+       if (0 == safeStrNCmp(file_path, tz_platform_path, safeStrLen(tz_platform_path))) {
                SETTING_TRACE("Default file[%s]!", file_path);
                return SETTING_RETURN_SUCCESS;
        }
@@ -198,12 +213,13 @@ int setting_sound_check_file_exist(void *data, const char *file_path)
                        SETTING_TRACE("%s", file_path);
                        return SETTING_RETURN_SUCCESS;
                }
+
+               const char *tz_platform_media = tzplatform_mkpath(TZ_SYS_MEDIA, SDCARD_PATH);
+
                SETTING_TRACE_ERROR(
                                "Cannot find the ringtone file[%s]!",
                                file_path);
-               if (0 == safeStrNCmp(
-                               file_path, SDCARD_PATH,
-                               safeStrLen(SDCARD_PATH))) {
+               if (0 == safeStrNCmp(file_path, tz_platform_media, safeStrLen(tz_platform_media))) {
                        char *strdup_file_path = strdup(file_path);
                        /*sdcard file*/
                        int ret = vconf_set_str(
@@ -217,13 +233,12 @@ int setting_sound_check_file_exist(void *data, const char *file_path)
                return SETTING_RETURN_FAIL;
        }
 
+       const char *tz_platform_media = tzplatform_mkpath(TZ_SYS_MEDIA, SDCARD_PATH);
+
        int mmc_status = VCONFKEY_SYSMAN_MMC_REMOVED;
        vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &mmc_status);
        if (VCONFKEY_SYSMAN_MMC_MOUNTED != mmc_status) {
-               if (!safeStrNCmp(
-                               SETTING_PROFILE_MMC_PATH,
-                               file_path,
-                               safeStrLen(SETTING_PROFILE_MMC_PATH))) {
+               if (!safeStrNCmp(tz_platform_media, file_path, safeStrLen(tz_platform_media))) {
                        return SETTING_RETURN_FAIL;
                }
        }
@@ -246,22 +261,20 @@ bool setting_sound_play_sound(
        sound_stream_info_h sound_stream_info_to_set = NULL;
 
        int is_existing = setting_sound_check_file_exist(ad, ringtone_file);
+       const char *tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_CALL_TONE_SDK);
 
        if (is_existing == SETTING_RETURN_FAIL || NULL == ringtone_file) {
                switch (sound_type) {
                case SOUND_TYPE_RINGTONE:
-                               ad->song_playing = (char *)g_strdup(
-                               _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3");
-                       sound_stream_info_to_set =
-                                       ad->ringtone_sound_stream_info;
+                       ad->song_playing = (char *)g_strdup(tz_platform_path);
+                       sound_stream_info_to_set = ad->ringtone_sound_stream_info;
                        break;
                case SOUND_TYPE_MEDIA:
                        if (isEmulBin())
-                               ad->song_playing = (char *)g_strdup(
-                                               SETTING_DEFAULT_CALL_TONE_SDK);
+                               ad->song_playing = (char *)g_strdup(tz_platform_path);
                        else
-                               ad->song_playing = (char *)g_strdup(
-                               _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3");
+                               ad->song_playing = (char *)g_strdup(tz_platform_path);
+
                        sound_stream_info_to_set = ad->media_sound_stream_info;
                        break;
                case SOUND_TYPE_NOTIFICATION:
@@ -877,21 +890,19 @@ static void __sound_vconf_change_cb(keynode_t *key, void *data)
        int ret = 0;
        char *vconf_name = vconf_keynode_get_name(key);
        Setting_GenGroupItem_Data *item_to_update = NULL;
+       const char *tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_CALL_TONE_SDK);
 
        if (!safeStrCmp(vconf_name, VCONFKEY_SYSMAN_MMC_STATUS)) {
                status = vconf_keynode_get_int(key);
                SETTING_TRACE("status:%d", status);
                if (VCONFKEY_SYSMAN_MMC_MOUNTED != status) {
                        /* when remove mmc card, change default tone */
-                       char *call_tone = vconf_get_str(
-                                       VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
+                       char *call_tone = vconf_get_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
                        if (call_tone && !safeStrNCmp(
                                        SETTING_PROFILE_MMC_PATH,
                                        call_tone,
                                        safeStrLen(SETTING_PROFILE_MMC_PATH))) {
-                                       ret = vconf_set_str(
-                                               VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR,
-                                               _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3");
+                                       ret = vconf_set_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, tz_platform_path);
                                if (ret < 0)
                                        SETTING_TRACE_DEBUG(
                                                        "failed to set vconf");

diff --git a/setting-profile-common/src/setting-profile-sound-main.c b/setting-profile-common/src/setting-profile-sound-main.c
index 6bac2126498469684f2ee1791a7bc27ee4f427ef..593fe9166f388a91b693a314a1a215dd36bcd202 100755 (executable)
--- a/setting-profile-common/src/setting-profile-sound-main.c
+++ b/setting-profile-common/src/setting-profile-sound-main.c
@@ -24,6 +24,7 @@
 #include <notification_setting_internal.h>
 #include <setting-common-general-func.h>
 #include <setting-profile-common.h>
+#include <tzplatform_config.h>
 
 #define DO_NOT_DISTURB_OP \
        "http://tizen.org/appcontrol/operation/setting/do_not_disturb"
@@ -45,7 +46,7 @@
 #define NOTIFICATION_STR_ON_LOCK_SCREEN_SHOW_ALL \
        "IDS_QP_OPT_SHOW_ALL_CONTENT_ABB"
 #define SILENT_MODE "Silent"
-#define INIT_PATH      _TZ_SYS_GLOBALUSER_DATA"/settings/Vibrations/"
+#define INIT_PATH "/settings/Vibrations/"
 
 /* should be called in function to return void */
 #define ADD_GENLIST2(genlist, parent) \
@@ -270,14 +271,18 @@ static Eina_Bool _play_ringtone_sound_idle_cb(void *data)
        if (0 == safeStrCmp(ad->viewtype, VOLUME_APP_NAME))
                return EINA_FALSE;
 
+       const char *tz_platform_path = NULL;
+
        if (state == PLAYER_STATE_IDLE) {
                pa_tone_path = vconf_get_str(
                                VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
                if (pa_tone_path == NULL) {
                        if (isEmulBin())
-                               pa_tone_path = strdup(SETTING_DEFAULT_CALL_TONE_SDK);
+                               tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_CALL_TONE_SDK);
                        else
-                               pa_tone_path = strdup(SETTING_DEFAULT_CALL_TONE);
+                               tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_CALL_TONE);
+
+                       pa_tone_path = strdup(tz_platform_path);
 
                        if (vconf_set_str(
                                        VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR,
@@ -434,12 +439,14 @@ static void _noti_slider_change_cb(
        if (0 == safeStrCmp(ad->viewtype, VOLUME_APP_NAME))
                return;
 
+       const char *tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_MSG_TONE);
+
        if (state == PLAYER_STATE_IDLE) {
                if (list_item->chk_status > 0) {
-                       char *pa_tone_path = vconf_get_str(
-                                       VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR);
+                       char *pa_tone_path = vconf_get_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR);
+
                        if (pa_tone_path == NULL) {
-                               pa_tone_path = strdup(SETTING_DEFAULT_MSG_TONE);
+                               pa_tone_path = strdup(tz_platform_path);
                                if (vconf_set_str(
                                                VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR,
                                                pa_tone_path) < 0) {
@@ -510,13 +517,16 @@ static void _media_slider_change_cb(
                return;
 
        player_get_state(ad->mp_player, &state);
+       const char *tz_platform_path = NULL;
 
        if (state == PLAYER_STATE_IDLE) {
                if (list_item->chk_status > 0) {
                        if (isEmulBin())
-                               pa_tone_path = strdup(SETTING_DEFAULT_CALL_TONE_SDK);
+                               tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_CALL_TONE_SDK);
                        else
-                               pa_tone_path = strdup(SETTING_DEFAULT_MEDIA_TONE);
+                               tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_MEDIA_TONE);
+
+                               pa_tone_path = strdup(tz_platform_path);
 
                        setting_sound_play_sound_origin(
                                        ad,
@@ -637,6 +647,8 @@ static void _get_lite_main_list(void *data)
        int max_system_vol = 0;
        Elm_Genlist_Item_Class *itc_slider = NULL;
        Evas_Object *genlist = ad->md.genlist;
+       const char *tz_platform_path = NULL;
+
        elm_genlist_block_count_set(genlist, 3);
        elm_genlist_homogeneous_set(genlist, EINA_FALSE);
 
@@ -683,9 +695,11 @@ static void _get_lite_main_list(void *data)
                                &sd_status) != 0) {
                        SETTING_TRACE_ERROR("fail to get mmc status");
                }
+
                sdcard_filepath = vconf_get_str(VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_STR);
+               const char *tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, INIT_PATH);
 
-               if (0 == safeStrNCmp(sdcard_filepath, INIT_PATH, safeStrLen(INIT_PATH))) {
+               if (0 == safeStrNCmp(sdcard_filepath, tz_platform_path, safeStrLen(tz_platform_path))) {
                        vconf_set_str(VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_STR, "NONE");
                        free(sdcard_filepath);
                        sdcard_filepath = vconf_get_str(VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_STR);
@@ -708,10 +722,13 @@ static void _get_lite_main_list(void *data)
                } else if (setting_sound_check_file_exist(ad, pa_ringtone) == SETTING_RETURN_FAIL) {
                        if (pa_ringtone)
                                FREE(pa_ringtone);
-                       if (isEmulBin())
-                               pa_ringtone = strdup(SETTING_DEFAULT_CALL_TONE_SDK);
-                       else
-                               pa_ringtone = strdup(SETTING_DEFAULT_CALL_TONE);
+                       if (isEmulBin()) {
+                               tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_CALL_TONE_SDK);
+                       } else {
+                               tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_CALL_TONE);
+                       }
+
+                       pa_ringtone = strdup(tz_platform_path);
 
                        vconf_ret = vconf_set_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, pa_ringtone);
                        if (vconf_ret < 0)
@@ -774,6 +791,8 @@ static void _get_lite_main_list(void *data)
                        _stop_change_cb);
        __BACK_POINTER_SET(ad->data_call_volume);
 
+       free(left_icon);
+
        /* Disable Call Volume slider if Silent ringtone is selected */
        if (ad->data_call_volume
                        && ad->data_call_alert_tone
@@ -793,10 +812,14 @@ static void _get_lite_main_list(void *data)
                } else if (setting_sound_check_file_exist(ad, pa_ringtone) == SETTING_RETURN_FAIL) {
                        if (pa_ringtone)
                                FREE(pa_ringtone);
-                       pa_ringtone = strdup(SETTING_DEFAULT_MSG_TONE);
-                       vconf_ret = vconf_set_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, SETTING_DEFAULT_MSG_TONE);
+
+                       tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_MSG_TONE);
+                       pa_ringtone = strdup(tz_platform_path);
+                       vconf_ret = vconf_set_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, tz_platform_path);
+
                        if (vconf_ret < 0)
                                SETTING_TRACE_DEBUG("failed to set vconf");
+
                } else  {
                        if (pa_ringtone)
                                sub_desc = setting_media_basename(pa_ringtone);
@@ -849,6 +872,7 @@ static void _get_lite_main_list(void *data)
                        _stop_change_cb);
        __BACK_POINTER_SET(ad->data_noti_volume);
 
+       free(left_icon);
        free(app_id);
        app_id = NULL;
 
@@ -880,6 +904,7 @@ static void _get_lite_main_list(void *data)
                        _start_change_cb,
                        _stop_change_cb);
 
+       free(left_icon);
        __BACK_POINTER_SET(ad->data_media_volume);
 
        /* 6.system volume */
@@ -900,6 +925,7 @@ static void _get_lite_main_list(void *data)
                        max_system_vol,
                        _start_change_cb, _stop_change_cb);
 
+       free(left_icon);
        __BACK_POINTER_SET(ad->data_touch_volume);
 
        if (0 != safeStrCmp(ad->viewtype, VOLUME_APP_NAME)) {
@@ -1243,20 +1269,24 @@ static void _create_myfile_ug(SettingSoundData *ad, char *titleID)
        if (APP_CONTROL_ERROR_NONE != app_control_create(&svc))
                return;
 
-       char *tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, const char *path)
+       const char *tz_platform_path = NULL;
 
        if (0 == safeStrCmp(ad->ringtone_type, "IDS_ST_MBODY_RINGTONE")) {
+               tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_CALL_TONE_SDK);
+
                pa_cur_ringtone = _prepare_ringtone_path(
                                VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR,
                                SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE,
-                               SETTING_DEFAULT_CALL_TONE_SDK,
+                               (char *)tz_platform_path,
                                SETTING_DEFAULT_CALL_TONE);
 
        } else if (0 == safeStrCmp(ad->ringtone_type, "IDS_ST_BODY_NOTIFICATION")) {
+               tz_platform_path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, SETTING_DEFAULT_MSG_TONE);
+
                pa_cur_ringtone = _prepare_ringtone_path(
                                VCONFKEY_SETAPPL_NOTI_RINGTONE_PATH_STR,
                                SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION,
-                               SETTING_DEFAULT_MSG_TONE,
+                               (char *)tz_platform_path,
                                SETTING_DEFAULT_MSG_TONE);
 
                app_control_add_extra_data(svc, "show_notification", "true");