Disable launching volume & lockscreen 26/60426/1 accepted/tizen/common/20160229.160739 submit/tizen_common/20160226.110718
authorgs86.lee <gs86.lee@samsung.com>
Fri, 26 Feb 2016 06:50:24 +0000 (15:50 +0900)
committergs86.lee <gs86.lee@samsung.com>
Fri, 26 Feb 2016 06:50:24 +0000 (15:50 +0900)
Change-Id: I310de8e84fc1259d7c4036151b95f1c269faa62e

src/common/home_mgr.c
src/common/starter.c

index d0517bc..d6b4cd6 100644 (file)
@@ -34,6 +34,8 @@
 #include "process_mgr.h"
 #include "popup.h"
 
+#define VOLUME_ENABLE 0
+
 #define HOME_TERMINATED "home_terminated"
 #define ISTRUE "TRUE"
 #define SYSPOPUPID_VOLUME "volume"
@@ -229,6 +231,7 @@ static int _change_selected_package_name(status_active_key_e key, void *data)
 
 
 
+#if VOLUME_ENABLE
 static void _after_launch_volume(int pid)
 {
        if (dbus_util_send_oomadj(pid, OOM_ADJ_VALUE_DEFAULT) < 0){
@@ -236,6 +239,7 @@ static void _after_launch_volume(int pid)
        }
        s_home_mgr.volume_pid = pid;
 }
+#endif
 
 
 
@@ -366,7 +370,9 @@ void home_mgr_relaunch_homescreen(void)
 
 void home_mgr_relaunch_volume(void)
 {
+#if VOLUME_ENABLE
        process_mgr_must_syspopup_launch(SYSPOPUPID_VOLUME, NULL, NULL, NULL, _after_launch_volume);
+#endif
 }
 
 
@@ -388,11 +394,13 @@ static int _power_off_cb(status_active_key_e key, void *data)
 
 
 
+#if VOLUME_ENABLE
 static Eina_Bool _launch_volume_idler_cb(void *data)
 {
        process_mgr_must_syspopup_launch(SYSPOPUPID_VOLUME, NULL, NULL, NULL, _after_launch_volume);
        return ECORE_CALLBACK_CANCEL;
 }
+#endif
 
 
 
@@ -405,17 +413,21 @@ void home_mgr_init(void *data)
        status_active_register_cb(STATUS_ACTIVE_KEY_SETAPPL_SELECTED_PACKAGE_NAME, _change_selected_package_name, NULL);
        _change_selected_package_name(STATUS_ACTIVE_KEY_SETAPPL_SELECTED_PACKAGE_NAME, NULL);
 
+#if VOLUME_ENABLE
        ecore_idler_add(_launch_volume_idler_cb, NULL);
+#endif
 }
 
 
 
 void home_mgr_fini(void)
 {
+#if VOLUME_ENABLE
        if (s_home_mgr.volume_pid > 0) {
                process_mgr_terminate_app(s_home_mgr.volume_pid, 1);
                s_home_mgr.volume_pid = -1;
        }
+#endif
 
        status_active_unregister_cb(STATUS_ACTIVE_KEY_STARTER_SEQUENCE, _show_home_cb);
        status_active_unregister_cb(STATUS_ACTIVE_KEY_SYSMAN_POWER_OFF_STATUS, _power_off_cb);
index 58b27af..5bd63be 100644 (file)
@@ -37,6 +37,8 @@
 #include "status.h"
 #include "hw_key.h"
 
+#define LOCKSCREEN_ENABLE 0
+
 #define PWLOCK_LITE_PKG_NAME "org.tizen.pwlock-lite"
 
 #define DATA_UNENCRYPTED "unencrypted"
@@ -128,7 +130,9 @@ static int _boot_animation_finished_cb(status_active_key_e key, void *data)
        _D("boot animation finished : %d", val);
 
        if (val == 1) {
+#if LOCKSCREEN_ENABLE
                lock_mgr_daemon_start();
+#endif
                _show_home();
        }
 
@@ -193,8 +197,10 @@ static int _set_i18n(const char *domain, const char *dir)
 static int _check_dead_signal(int pid, void *data)
 {
        int home_pid = 0;
+#if LOCKSCREEN_ENABLE
        int volume_pid = 0;
        int lock_pid = 0;
+#endif
 
        _D("Process %d is termianted", pid);
 
@@ -204,18 +210,22 @@ static int _check_dead_signal(int pid, void *data)
        }
 
        home_pid = home_mgr_get_home_pid();
+#if LOCKSCREEN_ENABLE
        volume_pid = home_mgr_get_volume_pid();
        lock_pid = lock_mgr_get_lock_pid();
+#endif
 
        if (pid == home_pid) {
                _D("Homescreen is dead");
                home_mgr_relaunch_homescreen();
+#if LOCKSCREEN_ENABLE
        } else if (pid == volume_pid) {
                _D("volume is dead");
                home_mgr_relaunch_volume();
        } else if (pid == lock_pid) {
                _D("lockscreen is dead");
                lock_mgr_unlock();
+#endif
        } else {
                _D("Unknown process, ignore it");
        }
@@ -270,7 +280,9 @@ static void _fini(struct appdata *ad)
 {
        home_mgr_fini();
        hw_key_destroy_window();
+#if LOCKSCREEN_ENABLE
        lock_mgr_daemon_end();
+#endif
 
        status_active_unregister_cb(STATUS_ACTIVE_KEY_SYSMAN_POWER_OFF_STATUS, _power_off_cb);
        status_active_unregister_cb(STATUS_ACTIVE_KEY_BOOT_ANIMATION_FINISHED, _boot_animation_finished_cb);