Remove safemode

Change-Id: I653905a5a7494ff38364c7c2ac70c2650671c831

diff --git a/include/status.h b/include/status.h
index f6cec2f..a5d58e3 100644 (file)
--- a/include/status.h
+++ b/include/status.h
@@ -66,7 +66,6 @@ struct status_passive_s {
        int setappl_sound_lock_bool;
        int setappl_motion_activation;
        int setappl_use_pick_up;
-       int idle_screen_safemode;
        int boot_animation_finished;
 
        char *setappl_3rd_lock_pkg_name_str;

diff --git a/rd3starter b/rd3starter
index ce80d71..56bc5d3 100644 (file)
--- a/rd3starter
+++ b/rd3starter
@@ -11,14 +11,4 @@ do
         /bin/sleep 0.1
 done
 
-vconf_set_safemode()
-{
-       if [ -f /opt/etc/.safeboot ]
-       then
-               /usr/bin/vconftool set -t int memory/idle-screen/safemode "1" -f
-       else
-               /usr/bin/vconftool set -t int memory/idle-screen/safemode "0" -f
-       fi
-}
-vconf_set_safemode
 exit 0

diff --git a/rd4starter b/rd4starter
index 409c90c..d01dc08 100644 (file)
--- a/rd4starter
+++ b/rd4starter
@@ -1,14 +1,4 @@
 #!/bin/sh
-vconf_set_safemode()
-{
-       if [ -f /opt/etc/.safeboot ]
-       then
-               /usr/bin/vconftool set -t int memory/idle-screen/safemode "1" -i -f
-       else
-               /usr/bin/vconftool set -t int memory/idle-screen/safemode "0" -i -f
-       fi
-}
-vconf_set_safemode
 
 echo -e "<2>[${_G}menu-daemon start${C_}]" > /dev/kmsg
 /usr/bin/starter &

diff --git a/src/mobile/home_mgr.c b/src/mobile/home_mgr.c
index bfa1d9c..d0517bc 100644 (file)
--- a/src/mobile/home_mgr.c
+++ b/src/mobile/home_mgr.c
@@ -112,10 +112,7 @@ void home_mgr_open_home(const char *appid)
 {
        char *home_appid = NULL;
 
-       if (status_passive_get()->idle_screen_safemode) {
-               _D("SAFE MODE is enabled");
-               home_appid = MENU_SCREEN_PKG_NAME;
-       } else if (!appid) {
+       if (!appid) {
                home_appid = status_active_get()->setappl_selected_package_name;
        } else {
                home_appid = (char *) appid;
@@ -258,9 +255,7 @@ static void _launch_home(const char *appid)
 {
        const char *home_appid = NULL;
 
-       if (status_passive_get()->idle_screen_safemode) {
-               home_appid = MENU_SCREEN_PKG_NAME;
-       } else if (!appid) {
+       if (!appid) {
                home_appid = status_active_get()->setappl_selected_package_name;
        } else {
                home_appid = (char *) appid;

diff --git a/src/status.c b/src/status.c
index c7af9df..818cca5 100644 (file)
--- a/src/status.c
+++ b/src/status.c
@@ -25,7 +25,6 @@
 int errno;
 
 #define VCONFKEY_REMOTE_LOCK_ISLOCKED "db/private/org.tizen.wfmw/is_locked"
-#define VCONFKEY_IDLE_SCREEN_SAFEMODE "memory/idle-screen/safemode"
 
 
 
@@ -62,7 +61,6 @@ static struct status_passive_s s_status_passive = {
        .setappl_sound_lock_bool = -1,
        .setappl_motion_activation = -1,
        .setappl_use_pick_up = -1,
-       .idle_screen_safemode = -1,
        .boot_animation_finished = -1,
 
        .setappl_3rd_lock_pkg_name_str = NULL,
@@ -242,8 +240,6 @@ static void _status_passive_change_cb(keynode_t* node, void *data)
                s_status_passive.setappl_psmode = vconf_keynode_get_int(node);
        } else if (!strcmp(key_name, VCONFKEY_STARTER_RESERVED_APPS_STATUS)) {
                s_status_passive.starter_reserved_apps_status = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_IDLE_SCREEN_SAFEMODE)) {
-               s_status_passive.idle_screen_safemode = vconf_keynode_get_int(node);
        } else if (!strcmp(key_name, VCONFKEY_BOOT_ANIMATION_FINISHED)) {
                s_status_passive.boot_animation_finished = vconf_keynode_get_int(node);
        } else if (!strcmp(key_name, VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR)) {
@@ -423,13 +419,6 @@ int status_register(void)
                s_status_passive.setappl_use_pick_up = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_IDLE_SCREEN_SAFEMODE, _status_passive_change_cb, NULL) < 0) {
-               _E("Failed to register add the callback for %s", VCONFKEY_IDLE_SCREEN_SAFEMODE);
-       } else if (vconf_get_int(VCONFKEY_IDLE_SCREEN_SAFEMODE, &s_status_passive.idle_screen_safemode ) < 0) {
-               _E("Failed to get vconfkey[%s]", VCONFKEY_IDLE_SCREEN_SAFEMODE);
-               s_status_passive.idle_screen_safemode  = -1;
-       }
-
        if (vconf_notify_key_changed(VCONFKEY_BOOT_ANIMATION_FINISHED, _status_passive_change_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_BOOT_ANIMATION_FINISHED);
        } else if (vconf_get_int(VCONFKEY_BOOT_ANIMATION_FINISHED, &s_status_passive.boot_animation_finished) < 0) {
@@ -550,10 +539,6 @@ void status_unregister(void)
                _E("Failed to unregister the callback for %s", VCONFKEY_SETAPPL_USE_PICK_UP);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_IDLE_SCREEN_SAFEMODE, _status_passive_change_cb) < 0) {
-               _E("Failed to unregister the callback for %s", VCONFKEY_IDLE_SCREEN_SAFEMODE);
-       }
-
        if (vconf_ignore_key_changed(VCONFKEY_BOOT_ANIMATION_FINISHED, _status_passive_change_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_BOOT_ANIMATION_FINISHED);
        }