fix volume app ID

[apps/native/starter.git] / src / mobile / home_mgr.c

diff --git a/src/mobile/home_mgr.c b/src/mobile/home_mgr.c
old mode 100644 (file)
new mode 100755 (executable)
index eea4561..dc25ae6
--- a/src/mobile/home_mgr.c
+++ b/src/mobile/home_mgr.c
@@ -22,7 +22,6 @@
 #include <fcntl.h>
 #include <pkgmgr-info.h>
 #include <stdio.h>
-#include <dd-deviced.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -36,7 +35,7 @@
 
 #define HOME_TERMINATED "home_terminated"
 #define ISTRUE "TRUE"
-#define SYSPOPUPID_VOLUME "volume"
+#define SYSPOPUPID_VOLUME "org.tizen.volume"
 #define APPID_INDICATOR "org.tizen.indicator"
 #define APPID_QUICKPANEL "org.tizen.quickpanel"
 
@@ -101,10 +100,13 @@ int home_mgr_get_quickpanel_pid(void)
 
 static void _after_launch_home(int pid)
 {
-       if (dbus_util_send_oomadj(pid, OOM_ADJ_VALUE_HOMESCREEN) < 0){
-               _E("failed to send oom dbus signal");
+       if (pid != s_home_mgr.home_pid) {
+               _I("home is created by power key new[%d] != old[%d]", pid, s_home_mgr.home_pid);
+               if (pid > 0) {
+                       dbus_util_send_perceptible_signal(pid);
+               }
+               s_home_mgr.home_pid = pid;
        }
-       s_home_mgr.home_pid = pid;
 }
 
 
@@ -126,29 +128,18 @@ static int _change_home_cb(const char *appid, const char *key, const char *value
 
 
 
-#define SERVICE_OPERATION_MAIN_KEY "__APP_SVC_OP_TYPE__"
-#define SERVICE_OPERATION_MAIN_VALUE "http://tizen.org/appcontrol/operation/main"
-void home_mgr_open_home(const char *appid)
+void home_mgr_open_home(const char *appid, const char *key, const char *val)
 {
        char *home_appid = NULL;
 
-#ifndef TIZEN_BUILD_TARGET_64
        if (!appid) {
                home_appid = status_active_get()->setappl_selected_package_name;
        } else {
                home_appid = (char *) appid;
        }
        ret_if(!home_appid);
-#else
-       /*
-        * If the architecture is 64bit,
-        * starter will launch menu-screen only.
-        */
-       _D("[64bit] menu-screen will be launched.");
-       home_appid = MENU_SCREEN_PKG_NAME;
-#endif
-
-       process_mgr_must_launch(home_appid, SERVICE_OPERATION_MAIN_KEY, SERVICE_OPERATION_MAIN_VALUE, _change_home_cb, _after_launch_home);
+
+       process_mgr_must_launch(home_appid, key, val, _change_home_cb, _after_launch_home);
 }
 
 
@@ -200,7 +191,7 @@ static int _show_home_cb(status_active_key_e key, void *data)
                        }
                }
 
-               home_mgr_open_home(NULL);
+               home_mgr_open_home(NULL, NULL, NULL);
                break;
        default:
                _E("False sequence [%d]", seq);
@@ -251,7 +242,7 @@ static int _change_selected_package_name(status_active_key_e key, void *data)
                }
        }
 
-       home_mgr_open_home(appid);
+       home_mgr_open_home(appid, NULL, NULL);
 
        return 1;
 }
@@ -260,10 +251,13 @@ static int _change_selected_package_name(status_active_key_e key, void *data)
 
 static void _after_launch_volume(int pid)
 {
-       if (dbus_util_send_oomadj(pid, OOM_ADJ_VALUE_DEFAULT) < 0){
-               _E("failed to send oom dbus signal");
+       if (pid != s_home_mgr.volume_pid) {
+               _I("volume is launched new[%d] != old[%d]", pid, s_home_mgr.volume_pid);
+               if (pid > 0) {
+                       dbus_util_send_perceptible_signal(pid);
+               }
+               s_home_mgr.volume_pid = pid;
        }
-       s_home_mgr.volume_pid = pid;
 }
 
 
@@ -284,12 +278,13 @@ static void _after_launch_quickpanel(int pid)
 
 static void _launch_after_home(int pid)
 {
-       if (pid > 0) {
-               if(dbus_util_send_oomadj(pid, OOM_ADJ_VALUE_HOMESCREEN) < 0){
-                       _E("failed to send oom dbus signal");
+       if (pid != s_home_mgr.home_pid) {
+               _I("home is created by power key new[%d] != old[%d]", pid, s_home_mgr.home_pid);
+               if (pid > 0) {
+                       dbus_util_send_perceptible_signal(pid);
                }
+               s_home_mgr.home_pid = pid;
        }
-       s_home_mgr.home_pid = pid;
 }
 
 
@@ -432,7 +427,7 @@ static int _power_off_cb(status_active_key_e key, void *data)
 {
        int val = status_active_get()->sysman_power_off_status;
 
-       if (val == VCONFKEY_SYSMAN_POWER_OFF_DIRECT || val == VCONFKEY_SYSMAN_POWER_OFF_RESTART) {
+       if (val > VCONFKEY_SYSMAN_POWER_OFF_NONE) {
                s_home_mgr.power_off = 1;
        } else {
                s_home_mgr.power_off = 0;
@@ -447,11 +442,9 @@ static int _power_off_cb(status_active_key_e key, void *data)
 
 static Eina_Bool _launch_apps_idler_cb(void *data)
 {
-#ifndef TIZEN_BUILD_TARGET_64
        process_mgr_must_syspopup_launch(SYSPOPUPID_VOLUME, NULL, NULL, NULL, _after_launch_volume);
        process_mgr_must_launch(APPID_INDICATOR, NULL, NULL, NULL, _after_launch_indicator);
        process_mgr_must_launch(APPID_QUICKPANEL, NULL, NULL, NULL, _after_launch_quickpanel);
-#endif
 
        return ECORE_CALLBACK_CANCEL;
 }
@@ -460,12 +453,11 @@ static Eina_Bool _launch_apps_idler_cb(void *data)
 
 void home_mgr_init(void *data)
 {
-       _D( "[MENU_DAEMON]home_mgr_init is invoked");
+       _D("[MENU_DAEMON]home_mgr_init is invoked");
 
        status_active_register_cb(STATUS_ACTIVE_KEY_STARTER_SEQUENCE, _show_home_cb, NULL);
        status_active_register_cb(STATUS_ACTIVE_KEY_SYSMAN_POWER_OFF_STATUS, _power_off_cb, NULL);
        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);
 
        ecore_idler_add(_launch_apps_idler_cb, NULL);
 }