Fix some bugs.

 - Add FREE(x) to fix memory leak.
 - Add return check when calling APIs.
 - Add NULL check.

Change-Id: Ib38253ca6f2654105b86c48b5d4899f76bcd62ae
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e8b2526c888bb00119025973672be9b10530815..16357dcc5ac02a082a0f999d2915fc2242ade144 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(SRCS
     src/setting-vibration.c
     src/setting-connection.c
     src/setting-clock.c
-    src/setting-homescreen.c
+#    src/setting-homescreen.c
 #    src/setting-volume.c
     src/setting-volume-page.c
     src/setting-info.c
@@ -20,7 +20,7 @@ SET(SRCS
     src/setting-language.c
     src/setting-safety.c
 #   src/setting-reset.c
-    src/setting-battery.c
+#   src/setting-battery.c
     src/setting-common-sound.c
     src/util.c
     src/setting_data_vconf.c

diff --git a/src/setting-clock.c b/src/setting-clock.c
index 4490c404323144366c6715bef915bae6feb8b70c..229b1925a5a9f7bce4414d2874b2d3c76fac3f1b 100644 (file)
--- a/src/setting-clock.c
+++ b/src/setting-clock.c
@@ -71,7 +71,6 @@ static Evas_Object *g_font_style_genlist = NULL;
 static Evas_Object *g_font_genlist = NULL;
 
 
-static char *font_name = NULL;
 static int font_size_index      = 1;           /* default: normal */
 
 static Elm_Object_Item *font_style_item = NULL;
@@ -2925,10 +2924,8 @@ static void _font_style_gl_cb(void *data, Evas_Object *obj, void *event_info)
 
        /*elm_radio_value_set(g_app_context->font_style_rdg, id->index); */
 
-
-       if (id->font_name) {
-               FREE(font_name);
-               font_name = strdup(id->font_name);
+       if (id && id->font_name) {
+               system_settings_set_value_string(SYSTEM_SETTINGS_KEY_FONT_TYPE, id->font_name);
        }
 
        /*elm_genlist_realized_items_update(g_font_style_genlist); */
@@ -2942,12 +2939,6 @@ static void _font_style_gl_cb(void *data, Evas_Object *obj, void *event_info)
                g_app_context->font_style_rdg = NULL;
        }
 
-       if (font_name) {
-               system_settings_set_value_string(SYSTEM_SETTINGS_KEY_FONT_TYPE, font_name);
-               FREE(font_name);
-       } else {
-               ERR("font_name is null");
-       }
 
        g_font_style_genlist = NULL;
        back_key_generic_cb(g_app_context, obj, event_info);
@@ -2961,7 +2952,8 @@ static void _font_size_gl_cb(void *data, Evas_Object *obj, void *event_info)
 
        if (system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, &old_font_size)
                != SYSTEM_SETTINGS_ERROR_NONE) {
-               DBG("Setting - system_settings_get_value_int() is failed.");
+               DBG("Setting - system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE) is failed.");
+               back_key_generic_cb(g_app_context, obj, event_info);
                return;
        }
        DBG("Setting - old font size is %d.", old_font_size);
@@ -2980,7 +2972,12 @@ static void _font_size_gl_cb(void *data, Evas_Object *obj, void *event_info)
 
        if (old_font_size != font_size_index) {
                DBG("Setting - font size is same with old.");
-               system_settings_set_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, font_size_index);
+               if (system_settings_set_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, font_size_index)
+                       != SYSTEM_SETTINGS_ERROR_NONE){
+                       ERR("Setting - system_settings_set_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE) is failed.");
+                       back_key_generic_cb(g_app_context, obj, event_info);
+                       return;
+               }
 
                if (font_size_item) {
                        elm_genlist_item_update(font_size_item);
@@ -3164,8 +3161,12 @@ static Eina_List *_get_available_font_list()
                                        }
 
                                        if (eina_list_data_find(list, family_result) == NULL) {
-                                               list = eina_list_append(list, strdup(family_result));
-                                               DBG("-------- ADDED FONT - family result = %s", (char *)family_result);
+                                               if (family_result) {
+                                                       list = eina_list_append(list, strdup(family_result));
+                                                       DBG("-------- ADDED FONT - family result = %s", (char *)family_result);
+                                               } else {
+                                                       ERR("ADD FONT FAIL, family_result is null");
+                                               }
                                        }
                                }
 
@@ -3253,7 +3254,6 @@ int _show_font_style_list(void *data)
 
        elm_genlist_item_class_free(title_item);
 
-       FREE(font_name);
        ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_FONT_TYPE, &tmp_name);
        if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
                ERR("failed to call system_setting_get_value_string with err %d", ret);
@@ -3276,7 +3276,6 @@ int _show_font_style_list(void *data)
                Font_Style_Item_Data *id_default = calloc(sizeof(Font_Style_Item_Data), 1);
                if (default_font_name && tmp_name && !strcmp(tmp_name, default_font_name)) {
                        matched_idx = idx;
-                       font_name = strdup(tmp_name);
                }
                if (id_default) {
                        id_default->index = idx++;
@@ -3299,7 +3298,6 @@ int _show_font_style_list(void *data)
                        Font_Style_Item_Data *id = calloc(sizeof(Font_Style_Item_Data), 1);
                        if (tmp_name && !strcmp((const char *)tmp_name, (const char *)font_data)) {
                                matched_idx = idx;
-                               font_name = strdup(tmp_name);
                        }
 
                        DBG("font_data -------> %s", (const char *)font_data);
@@ -3371,7 +3369,6 @@ static void _lang_update_font_style_list(void *data, Evas_Object *obj, void *eve
                itc->func.content_get = _gl_font_style_ridio_get;
                itc->func.del = _font_style_gl_del;
 
-               FREE(font_name);
                ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_FONT_TYPE, &tmp_name);
                if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
                        ERR("failed to call system_setting_get_value_string with err %d", ret);
@@ -3392,7 +3389,6 @@ static void _lang_update_font_style_list(void *data, Evas_Object *obj, void *eve
                Font_Style_Item_Data *id_default = calloc(sizeof(Font_Style_Item_Data), 1);
                if (default_font_name && tmp_name && !strcmp(tmp_name, default_font_name)) {
                        matched_idx = idx;
-                       font_name = strdup(tmp_name);
                }
                if (id_default) {
                        id_default->index = idx++;
@@ -3410,7 +3406,6 @@ static void _lang_update_font_style_list(void *data, Evas_Object *obj, void *eve
                                Font_Style_Item_Data *id = calloc(sizeof(Font_Style_Item_Data), 1);
                                if (tmp_name && !strcmp((const char *)tmp_name, (const char *)font_data)) {
                                        matched_idx = idx;
-                                       font_name = strdup(tmp_name);
                                }
                                DBG("Font1: %s, Font2: %s", tmp_name, font_data);
 

diff --git a/src/setting-common-sound.c b/src/setting-common-sound.c
index d2cafb817527f533bc126ef9aadd1033ff5033c8..d02ba62204fd87164a0b8b2ceaf965a175dde9ba 100644 (file)
--- a/src/setting-common-sound.c
+++ b/src/setting-common-sound.c
@@ -54,7 +54,11 @@ int get_sound_mode()
 int get_sound_type(sound_stream_type_e stream_type)
 {
        sound_stream_info_h stream_info = NULL;
-       sound_manager_create_stream_information(stream_type, NULL, NULL, &stream_info);
+       int ret = sound_manager_create_stream_information(stream_type, NULL, NULL, &stream_info);
+       if (ret != SOUND_MANAGER_ERROR_NONE) {
+               ERR("sound_manager_create_stream_information() get failed with err[%d, 0x%x]", ret, ret);
+               return ret;
+       }
        sound_type_e type;
        sound_manager_get_sound_type(stream_info, &type);
        sound_manager_destroy_stream_information(stream_info);
@@ -64,7 +68,11 @@ int get_sound_type(sound_stream_type_e stream_type)
 int get_sound_internal_type(sound_stream_type_internal_e stream_type)
 {
        sound_stream_info_h stream_info = NULL;
-       sound_manager_create_stream_information_internal(stream_type, NULL, NULL, &stream_info);
+       int ret = sound_manager_create_stream_information_internal(stream_type, NULL, NULL, &stream_info);
+       if (ret != SOUND_MANAGER_ERROR_NONE) {
+               ERR("sound_manager_create_stream_information_internal() get failed with err[%d, 0x%x]", ret, ret);
+               return ret;
+       }
        sound_type_e type;
        sound_manager_get_sound_type(stream_info, &type);
        sound_manager_destroy_stream_information(stream_info);
@@ -148,15 +156,24 @@ int profile_play_sound(void *data, void *cb, char *ringtone_file, float vol, int
        DBG("Setting - profile_play_sound is creating.");
 
        sound_stream_info_h stream_info = NULL;
-       if (stream_type == SOUND_STREAM_TYPE_RINGTONE_CALL)
-               sound_manager_create_stream_information_internal(stream_type, NULL, NULL, &stream_info);
-       else
-               sound_manager_create_stream_information(stream_type, NULL, NULL, &stream_info);
+       if (stream_type == SOUND_STREAM_TYPE_RINGTONE_CALL) {
+               int ret = sound_manager_create_stream_information_internal(stream_type, NULL, NULL, &stream_info);
+               if (ret != SOUND_MANAGER_ERROR_NONE) {
+                       ERR("sound_manager_create_stream_information_internal() get failed with err[%d, 0x%x]", ret, ret);
+                       return ret;
+               }
+       } else {
+               int ret = sound_manager_create_stream_information(stream_type, NULL, NULL, &stream_info);
+               if (ret != SOUND_MANAGER_ERROR_NONE) {
+                       ERR("sound_manager_create_stream_information() get failed with err[%d, 0x%x]", ret, ret);
+                       return ret;
+               }
+       }
 
        int err = 0;
        err = player_create(&player);
        if (err != PLAYER_ERROR_NONE) {
-               DBG("Setting - creating the player handle failed[%d]", err);
+               ERR("Setting - creating the player handle failed[%d]", err);
                return 0;
        }
 
@@ -165,7 +182,7 @@ int profile_play_sound(void *data, void *cb, char *ringtone_file, float vol, int
 
        err = player_set_sound_stream_info(player, stream_info);
        if (err != PLAYER_ERROR_NONE) {
-               DBG("Setting - error to set stream_info[%d]", err);
+               ERR("Setting - error to set stream_info[%d]", err);
                player_destroy(player);
                is_player_created = 0;
                sound_manager_destroy_stream_information(stream_info);
@@ -176,7 +193,7 @@ int profile_play_sound(void *data, void *cb, char *ringtone_file, float vol, int
 
        err = player_set_uri(player, ringtone_file);
        if (err != PLAYER_ERROR_NONE) {
-               DBG("Setting - error to set attribute---profile_uri[%d]", err);
+               ERR("Setting - error to set attribute---profile_uri[%d]", err);
                player_destroy(player);
                is_player_created = 0;
                sound_manager_destroy_stream_information(stream_info);
@@ -187,7 +204,7 @@ int profile_play_sound(void *data, void *cb, char *ringtone_file, float vol, int
 
        err = player_prepare_async(player, _profile_player_prepare_cb, NULL);
        if (err != PLAYER_ERROR_NONE) {
-               DBG("Setting - realizing the player handle failed[%d]", err);
+               ERR("Setting - realizing the player handle failed[%d]", err);
                player_destroy(player);
                is_player_created = 0;
                sound_manager_destroy_stream_information(stream_info);

diff --git a/src/setting-device.c b/src/setting-device.c
index e1538a67e7ba22886ec304716455ae45dbaaf119..5fefad6cd29c0439a348ef18a529df4ca58a099c 100644 (file)
--- a/src/setting-device.c
+++ b/src/setting-device.c
@@ -213,11 +213,9 @@ static void _auto_open_apps_check_changed_cb(void *data, Evas *e, Evas_Object *o
                layout = elm_layout_add(popup);
                elm_layout_theme_set(layout, "layout", "popup", "content/circle/buttons2");
 
-               char *txt = strdup(buf);
-               elm_object_text_set(layout, txt);
+               elm_object_text_set(layout, buf);
                elm_object_content_set(popup, layout);
 
-               FREE(txt);
 
                btn1 = elm_button_add(popup);
                elm_object_style_set(btn1, "popup/circle/left");
@@ -673,11 +671,12 @@ static void _last_app_check_popup_cb(void *data, Evas_Object *obj, void *event_i
        char buf[1024];
 
        char *font_size_frame = "<text_class=tizen><align=center><font_size=28>%s</font_size></align></text_class>";
-       snprintf(buf, sizeof(buf) - 1, font_size_frame, elm_entry_utf8_to_markup(_("WDS_ST_POP_OPEN_THE_LAST_APP_YOU_USED_BY_PRESSING_THE_HOME_KEY_TWICE_ON_WATCH_FACE_ABB")));
+       char *out_string = elm_entry_utf8_to_markup(_("WDS_ST_POP_OPEN_THE_LAST_APP_YOU_USED_BY_PRESSING_THE_HOME_KEY_TWICE_ON_WATCH_FACE_ABB"));
+       snprintf(buf, sizeof(buf) - 1, font_size_frame, out_string);
 
-       char *txt = strdup(buf);
-       elm_object_text_set(popup, txt);
-       FREE(txt);
+       FREE(out_string);
+
+       elm_object_text_set(popup, buf);
        _screen_reader_information_set(popup);
 
        btn = elm_button_add(popup);

diff --git a/src/setting-display.c b/src/setting-display.c
index 56f78b1114450ac7d18f3479dd5dbe0872501bac..92c312a2c442590779623a2d2ce881dec4ac25ea 100644 (file)
--- a/src/setting-display.c
+++ b/src/setting-display.c
@@ -90,7 +90,6 @@ static int touch_mode = NONE;
 /* Main display list item */
 static Elm_Object_Item *lang_item = NULL;
 static Elm_Object_Item *wake_up_item = NULL;
-static Elm_Object_Item *edit_icon_item = NULL;
 static Elm_Object_Item *g_screen_time_item = NULL;
 
 static void change_language_enabling(keynode_t *key, void *data);
@@ -327,11 +326,7 @@ char *_gl_display_title_get(void *data, Evas_Object *obj, const char *part)
        } else if (!strcmp(part, "elm.text.1")) {
                char *text_color = "<font color=#4DCFFFC9>%s</font>";
                const char *curr_lang = setting_get_lang_title();
-               if (id->item == edit_icon_item) {
-                       char *str = _get_homeview_type_subtitle();
-                       snprintf(buf, sizeof(buf) - 1, text_color, str);
-                       FREE(str);
-               } else if (id->item == lang_item) {
+               if (id->item == lang_item) {
                        if (curr_lang) {
                                if (is_connected_GM()) {
                                        snprintf(buf, sizeof(buf) - 1, "<font color=#515151>%s</font>", curr_lang);
@@ -420,7 +415,6 @@ Evas_Object *_create_display_list(void *data)
                Elm_Genlist_Item_Class *itc_tmp = NULL;
 
                if (menu_its[idx].type == SETTING_DISPLAY_GESTURE
-                       || menu_its[idx].type == SETTING_DISPLAY_ICON_SIZE
                        || menu_its[idx].type == SETTING_DISPLAY_LANG
                        || menu_its[idx].type == SETTING_DISPLAY_SCREEN_TIME) {
                        itc_tmp = itc2;
@@ -445,9 +439,6 @@ Evas_Object *_create_display_list(void *data)
                        } else if (menu_its[idx].type == SETTING_DISPLAY_GESTURE) {
                                DBG("wakeup item@!!!");
                                wake_up_item = id->item;
-                       } else if (menu_its[idx].type == SETTING_DISPLAY_ICON_SIZE) {
-                               DBG("edit icon item@!!!");
-                               edit_icon_item = id->item;
                        } else if (menu_its[idx].type == SETTING_DISPLAY_SCREEN_TIME) {
                                DBG("screen time item@!!!");
                                g_screen_time_item = id->item;

diff --git a/src/setting-info.c b/src/setting-info.c
index 274d960d11c7f22c8af4dc5ea3855e7480dfc8ef..b2e748ea93cab5a482a8695b15208731c491f041 100644 (file)
--- a/src/setting-info.c
+++ b/src/setting-info.c
@@ -474,16 +474,18 @@ char *_gl_info__detail_title_get(void *data, Evas_Object *obj, const char *part)
                        } else {
                                snprintf(buf, sizeof(buf) - 1, "%s", device_info);
                        }
+                       FREE(device_info);
                        break;
                case ABOUT_DEVICE_SOFTWARE_VERSION:
                        /*#endif */
                        if (system_info_get_platform_string("http://tizen.org/system/build.string", &device_info)
                                != SYSTEM_INFO_ERROR_NONE) {
                                DBG("Setting - Version name do not get!! error!!");
-                               snprintf(buf, sizeof(buf) - 1, "%s", "V700XXUAMJ1");
+                               snprintf(buf, sizeof(buf) - 1, "%s", _("IDS_ST_BODY_UNKNOWN"));
                        } else {
                                snprintf(buf, sizeof(buf) - 1, "%s", device_info);
                        }
+                       FREE(device_info);
                        break;
                case ABOUT_DEVICE_BLUETOOTH_ADDRESS:
                        _get_bluetooth_address_string(buf, sizeof(buf)-1);
@@ -502,6 +504,7 @@ char *_gl_info__detail_title_get(void *data, Evas_Object *obj, const char *part)
                        } else {
                                snprintf(buf, sizeof(buf) - 1, "%s", device_info);
                        }
+                       FREE(device_info);
                        break;
                /*#ifndef FEATURE_SETTING_SDK */
                case ABOUT_DEVICE_SERIAL_NUMBER:

diff --git a/src/setting-language.c b/src/setting-language.c
index f7e180ee93ef4430035fd38c430fa8ac8c58dfd3..b903f981c4eb8160ce0b43ba2f40657d775e1ff9 100644 (file)
--- a/src/setting-language.c
+++ b/src/setting-language.c
@@ -557,7 +557,7 @@ static void _tree_walk_langlist(xmlNodePtr cur)
 
                        struct _lang_menu_item *pitem = (struct _lang_menu_item *)calloc(1, sizeof(struct _lang_menu_item));
                        if (pitem) {
-                               pitem->id = id;
+                               pitem->id = strdup(id);
                                pitem->name = strdup(name);
 
                                sub_name = strdup(name);
@@ -568,6 +568,7 @@ static void _tree_walk_langlist(xmlNodePtr cur)
 
                                s_langlist = eina_list_append(s_langlist, pitem);
                        }
+                       FREE(id);
                        FREE(name);
                }
        }

diff --git a/src/setting-vibration.c b/src/setting-vibration.c
index e9776b5bc0d6906685dc3cec75eecce1cccb9757..ed6607a957390279b0b7fb67e9466555527fc267 100644 (file)
--- a/src/setting-vibration.c
+++ b/src/setting-vibration.c
@@ -71,7 +71,7 @@ enum {
 static char *
 _gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part)
 {
-       char buf[1024];
+       char buf[1024] = {0,};
        int title_idx = (uintptr_t)data;
        switch (title_idx) {
        case VIBRATION_TITLE_VIBRATION:
@@ -197,7 +197,7 @@ char *_gl_vibration_title_get(void *data, Evas_Object *obj, const char *part)
                switch (index) {
                case 0:
                        vibrate_type = get_vibration_level();
-                       snprintf(buf, sizeof(buf) - 1, text_color, _(vibration_power_str[vibrate_type % 3]));
+                       snprintf(buf, sizeof(buf) - 1, text_color, _(vibration_power_str[vibrate_type % 2]));
                        break;
                case 1:
                        snprintf(buf, sizeof(buf) - 1, text_color, "For notifications");

diff --git a/src/setting-volume-page.c b/src/setting-volume-page.c
index 413302dc97679426c2b67ba03370134ca7211edc..0903e9d3bde55bc470a78a07b5be408baeeac91c 100644 (file)
--- a/src/setting-volume-page.c
+++ b/src/setting-volume-page.c
@@ -286,14 +286,12 @@ _index_refresh(void *data)
                        printf("Added : %d\n", i);
                        elm_index_item_append(pd->index, NULL, NULL, (void *)(uintptr_t)i);
                }
-               pd->min_page = pd->cur_page;
                pd->min_page = pd->cur_page + num_index - 1;
        } else {
                for (i = pd->cur_page - num_index + 1; i < pd->cur_page + 1 ; i++) {
                        printf("Added : %d\n", i);
                        elm_index_item_append(pd->index, NULL, NULL, (void *)(uintptr_t)i);
                }
-               pd->min_page = pd->cur_page - num_index;
                pd->min_page = pd->cur_page - 1;
        }
        elm_index_level_go(pd->index, 0);
@@ -1205,24 +1203,25 @@ static void _play_sound_all_type(int sound_type, float volume)
        const char *sound_path = NULL;
        int temp_volume_index = 0;
        switch (sound_type) {
-       case SOUND_STREAM_TYPE_RINGTONE_CALL:
-               temp_volume_index = volume_index;
+       case SOUND_STREAM_TYPE_RINGTONE_CALL: {
+                       temp_volume_index = volume_index;
 
-               int ret_vconf = vconf_set_int(VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT, temp_volume_index);
-               vconf_set_int("db/setting/sound/call/rmd_ringtone_volume", temp_volume_index);  /* backup ringtone volume */
+                       int ret_vconf = vconf_set_int(VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT, temp_volume_index);
+                       vconf_set_int("db/setting/sound/call/rmd_ringtone_volume", temp_volume_index);  /* backup ringtone volume */
 
-               /*_set_volumn(sound_type, volume_index, VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT); */
+                       /*_set_volumn(sound_type, volume_index, VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT); */
 
-               ERR("vconf_name SET INT : %s = %d, ret %d", VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT, temp_volume_index, ret_vconf);
+                       ERR("vconf_name SET INT : %s = %d, ret %d", VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT, temp_volume_index, ret_vconf);
 
-               sound_path = vconf_get_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
-               if (sound_path) {
-                       snprintf(buf, sizeof(buf)-1, "%s", sound_path);
-               } else {
-                       snprintf(buf, sizeof(buf)-1, "%s", VCONFKEY_SETAPPL_CALL_RINGTONE_DEFAULT_PATH_STR);
-               }
+                       sound_path = vconf_get_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
+                       if (sound_path) {
+                               snprintf(buf, sizeof(buf)-1, "%s", sound_path);
+                       } else {
+                               snprintf(buf, sizeof(buf)-1, "%s", VCONFKEY_SETAPPL_CALL_RINGTONE_DEFAULT_PATH_STR);
+                       }
 
-               break;
+                       break;
+               }
        case SOUND_STREAM_TYPE_MEDIA:
                _set_volumn(sound_type, volume_index, VCONFKEY_SETAPPL_MEDIA_SOUND_VOLUME_INT);
 

diff --git a/src/setting.c b/src/setting.c
index 43b3892500759ef9db5523b59ac22a057dae389e..c4c82b29c1e8ff24a5b841a9997e6fce63b0920d 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -20,13 +20,11 @@
 #include "setting-sound.h"
 #include "setting-volume.h"
 #include "setting-clock.h"
-#include "setting-homescreen.h"
 #include "setting-info.h"
 #include "setting-bluetooth.h"
 #include "setting-motion.h"
 #include "setting-display.h"
 #include "setting-language.h"
-#include "setting-battery.h"
 #include "setting-device.h"
 #include "setting-privacy.h"
 #include "setting-connection.h"
@@ -1080,8 +1078,8 @@ void app_terminate(void *data)
 
        eext_circle_surface_del(ad->circle_surface);
 
-       int ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE);
-       DBG("locale tzone unset cb ret = %s", get_error_message(ret));
+       /*int ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE); */
+       /*DBG("locale tzone unset cb ret = %s", get_error_message(ret)); */
 }
 
 void app_pause(void *data)
@@ -1097,8 +1095,6 @@ void app_pause(void *data)
                } else if (ad->MENU_TYPE == SETTING_SOUND_RINGTONE ||
                                   ad->MENU_TYPE == SETTING_SOUND_NOTIFICATION) {
                        _stop_all_sound_play();
-               } else if (ad->MENU_TYPE == SETTING_BATTERY) {
-                       _clear_battery_cb(NULL, NULL, NULL, NULL);
                } else if (ad->MENU_TYPE == SETTING_SOUND) {
                        _stop_all_sound_play();
                }
@@ -1336,7 +1332,6 @@ int main(int argc, char *argv[])
        event_callback.app_control = app_reset;
 
        ui_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, NULL, NULL);
-       ui_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, NULL, NULL);
        ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, _lang_changed, NULL);
        ui_app_add_event_handler(&handlers[APP_EVENT_REGION_FORMAT_CHANGED], APP_EVENT_REGION_FORMAT_CHANGED, NULL, NULL);
        ui_app_add_event_handler(&handlers[APP_EVENT_DEVICE_ORIENTATION_CHANGED], APP_EVENT_DEVICE_ORIENTATION_CHANGED, NULL, NULL);