Changes for tray launch after oobe termination.

Change-Id: Idcb78c074b5378b535f023237c1822bc868a53fd
Signed-off-by: shivamv <shivam.v2@samsung.com>

diff --git a/src/common/home_mgr.c b/src/common/home_mgr.c
index a30c6bb1b0d3c5fc7a181f12858827f3f595e742..439b4216370fdef69ddd422148b23fa55bda9e2c 100755 (executable)
--- a/src/common/home_mgr.c
+++ b/src/common/home_mgr.c
@@ -535,7 +535,6 @@ static Eina_Bool _launch_apps_idler_cb(void *data)
 #endif
        process_mgr_must_launch(APPID_INDICATOR, NULL, NULL, NULL, _after_launch_indicator);
        process_mgr_must_launch(APPID_QUICKPANEL, NULL, NULL, NULL, _after_launch_quickpanel);
-       process_mgr_must_launch(APPID_TRAY, NULL, NULL, NULL, _after_launch_tray);
        return ECORE_CALLBACK_CANCEL;
 }
 

diff --git a/src/common/starter.c b/src/common/starter.c
index 1d5ece8c2bda5fbad35a1529536c9ab4542087a5..f24cc768fc1f1392292c9e10ad7a571eff86d1e4 100755 (executable)
--- a/src/common/starter.c
+++ b/src/common/starter.c
@@ -247,6 +247,7 @@ static int _check_dead_signal(int pid, void *data)
        } else if (pid == oobe_setup_pid) {
                _D("oobe setup is dead");
                oobe_mgr_oobe_setup_terminated();
+               home_mgr_relaunch_tray();
        } else if (pid == softkey_pid) {
                _D("softkey is dead");
                home_mgr_softkey_dead_signal_received();
@@ -316,6 +317,10 @@ static void _init(void)
        hw_key_create_window();
        home_mgr_init();
        oobe_mgr_init();
+       if( oobe_mgr_get_oobe_setup_pid() < 0)
+       {
+               home_mgr_relaunch_tray();
+       }
        softkey_mgr_init();
 
        r = aul_listen_app_dead_signal(_check_dead_signal, NULL);