From 72223bc19644d2e5592aa8a05bc3762ef56011b4 Mon Sep 17 00:00:00 2001 From: Young Ik Cho Date: Fri, 11 Oct 2013 21:13:49 +0900 Subject: add exception for submode request Change-Id: I9714d5552db92af333d4bfbf77cb2897de081ba7 Signed-off-by: Young Ik Cho --- src/launch_with_result.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/launch_with_result.c b/src/launch_with_result.c index 60fd2ec3..b8ff4fd5 100755 --- a/src/launch_with_result.c +++ b/src/launch_with_result.c @@ -440,8 +440,11 @@ int app_subapp_terminate_request() { if(is_subapp) { subapp_cb(subapp_data); + + return 0; } - return 0; + + return -1; } SLPAPI int aul_set_subapp(subapp_fn cb, void *data) -- cgit v1.2.3 From 2890cb8ea1c1903e5b5f7d5ffb0fdb9412ea3c59 Mon Sep 17 00:00:00 2001 From: Jaeho Lee Date: Sat, 12 Oct 2013 14:41:24 +0900 Subject: Fix a launch bug at installation Signed-off-by: Jaeho Lee Change-Id: I51e944de3bc6647f425ace0a6ea48c50b43dc5ff --- am_daemon/amd_appinfo.c | 43 ++++++++++++++++++++++++++++++++++++++++++- packaging/aul.spec | 5 ++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/am_daemon/amd_appinfo.c b/am_daemon/amd_appinfo.c index 94f73f5d..e0dc2b4c 100755 --- a/am_daemon/amd_appinfo.c +++ b/am_daemon/amd_appinfo.c @@ -277,7 +277,7 @@ static void __vconf_cb(keynode_t *key, void *data) g_hash_table_remove(cf->tbl, appid); } else if (strncmp(type_string, "update", 6) == 0){ /*REMOVE EXISTING ENTRY & CREATE AGAIN*/ - if (g_hash_table_remove(cf->tbl, appid) == true){ + if (g_hash_table_remove(cf->tbl, appid)){ if (pkgmgrinfo_appinfo_get_appinfo(appid, &handle) == PMINFO_R_OK){ __app_info_insert_handler(handle, data); pkgmgrinfo_appinfo_destroy_appinfo(handle); @@ -286,6 +286,41 @@ static void __vconf_cb(keynode_t *key, void *data) } } +int app_func(pkgmgrinfo_appinfo_h handle, void *user_data) +{ + char *appid = NULL; + struct appinfomgr *cf = (struct appinfomgr *)user_data; + int r; + + pkgmgrinfo_appinfo_get_appid(handle, &appid); + r = g_hash_table_remove(cf->tbl, appid); + SECURE_LOGD("upgrading... (%s)", appid); + + return 0; +} + +static int __cb(int req_id, const char *pkg_type, + const char *pkgid, const char *key, const char *val, + const void *pmsg, void *user_data) +{ + int ret = 0; + pkgmgrinfo_pkginfo_h handle; + + SECURE_LOGD("appid(%s), key(%s), value(%s)", pkgid, key, val); + + if((strncmp(key,"start", 5) == 0) && (strncmp(val, "upgrade", 7) == 0) ) { + ret = pkgmgrinfo_pkginfo_get_pkginfo(pkgid, &handle); + if (ret != PMINFO_R_OK) + return -1; + ret = pkgmgrinfo_appinfo_get_list(handle, PMINFO_UI_APP, app_func, user_data); + if (ret != PMINFO_R_OK) { + pkgmgrinfo_pkginfo_destroy_pkginfo(handle); + return -1; + } + pkgmgrinfo_pkginfo_destroy_pkginfo(handle); + } +} + int appinfo_init(struct appinfomgr **cf) { struct appinfomgr *_cf; @@ -326,6 +361,12 @@ int appinfo_init(struct appinfomgr **cf) if (r < 0) _E("Unable to register vconf notification callback for VCONFKEY_MENUSCREEN_DESKTOP\n"); + int event_type = PMINFO_CLIENT_STATUS_UPGRADE; + pkgmgrinfo_client *pc = NULL; + pc = pkgmgrinfo_client_new(PMINFO_REQUEST); + pkgmgrinfo_client_set_status_type(pc, event_type); + pkgmgrinfo_client_listen_status(pc, __cb , _cf); + *cf = _cf; return 0; diff --git a/packaging/aul.spec b/packaging/aul.spec index becbe088..0deaeaa1 100644 --- a/packaging/aul.spec +++ b/packaging/aul.spec @@ -1,6 +1,6 @@ Name: aul Summary: App utility library -Version: 0.0.282 +Version: 0.0.283 Release: 1 Group: System/Libraries License: Apache License, Version 2.0 @@ -56,6 +56,9 @@ Application utility library (devel) %if 0%{?simulator} CFLAGS="%{optflags} -D__emul__"; export CFLAGS %endif +export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE" +export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE" +export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" %cmake . -- cgit v1.2.3 From 2f10fa56c4eb9e3d2787d1b392802d0682f082b4 Mon Sep 17 00:00:00 2001 From: Jaeho Lee Date: Thu, 17 Oct 2013 19:48:56 +0900 Subject: change app2sd API Signed-off-by: Jaeho Lee --- CMakeLists.txt | 2 +- am_daemon/amd_launch.c | 5 +---- packaging/aul.spec | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dbb1ce2..909ce32c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") # Set required packages INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED dlog ecore x11 libprivilege-control app-checker rua glib-2.0 ecore-x ecore-input evas vconf pkgmgr-info app2sd privacy-manager-client) +pkg_check_modules(pkgs REQUIRED dlog ecore x11 libprivilege-control app-checker rua glib-2.0 ecore-x ecore-input evas vconf pkgmgr-info privacy-manager-client) pkg_check_modules(libpkgs REQUIRED dlog bundle dbus-glib-1 ail xdgmime app-checker libsmack) PKG_CHECK_MODULES(PKGS REQUIRED glib-2.0 gio-2.0 dlog bundle) diff --git a/am_daemon/amd_launch.c b/am_daemon/amd_launch.c index fed2659b..aa88100f 100755 --- a/am_daemon/amd_launch.c +++ b/am_daemon/amd_launch.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -752,9 +751,7 @@ int _start_app(char* appid, bundle* kb, int cmd, int caller_pid, uid_t caller_ui } } - if(app2ext_get_app_location(pkgid) == APP2EXT_SD_CARD) { - app2ext_enable_external_pkg(pkgid); - } + pkgmgrinfo_client_request_enable_external_pkg(pkgid); if (componet && strncmp(componet, "ui", 2) == 0) { multiple = appinfo_get_value(ai, AIT_MULTI); diff --git a/packaging/aul.spec b/packaging/aul.spec index 0deaeaa1..f889f8f6 100644 --- a/packaging/aul.spec +++ b/packaging/aul.spec @@ -1,6 +1,6 @@ Name: aul Summary: App utility library -Version: 0.0.283 +Version: 0.0.284 Release: 1 Group: System/Libraries License: Apache License, Version 2.0 @@ -33,7 +33,6 @@ BuildRequires: pkgconfig(utilX) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(pkgmgr-info) BuildRequires: pkgconfig(libsmack) -BuildRequires: pkgconfig(app2sd) BuildRequires: pkgconfig(privacy-manager-client) -- cgit v1.2.3 From b369a6c7100ee228970e3ac7ff60f68b86e818cb Mon Sep 17 00:00:00 2001 From: Jaeho Lee Date: Fri, 25 Oct 2013 13:07:16 +0900 Subject: Change package update noti string Signed-off-by: Jaeho Lee Change-Id: I8a714c32540ebea835ee4db97a1262c9fc98968b --- am_daemon/amd_appinfo.c | 2 +- packaging/aul.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/am_daemon/amd_appinfo.c b/am_daemon/amd_appinfo.c index e0dc2b4c..3da4437a 100755 --- a/am_daemon/amd_appinfo.c +++ b/am_daemon/amd_appinfo.c @@ -308,7 +308,7 @@ static int __cb(int req_id, const char *pkg_type, SECURE_LOGD("appid(%s), key(%s), value(%s)", pkgid, key, val); - if((strncmp(key,"start", 5) == 0) && (strncmp(val, "upgrade", 7) == 0) ) { + if((strncmp(key,"start", 5) == 0) && (strncmp(val, "update", 6) == 0) ) { ret = pkgmgrinfo_pkginfo_get_pkginfo(pkgid, &handle); if (ret != PMINFO_R_OK) return -1; diff --git a/packaging/aul.spec b/packaging/aul.spec index f889f8f6..3aeee18b 100644 --- a/packaging/aul.spec +++ b/packaging/aul.spec @@ -1,6 +1,6 @@ Name: aul Summary: App utility library -Version: 0.0.284 +Version: 0.0.285 Release: 1 Group: System/Libraries License: Apache License, Version 2.0 -- cgit v1.2.3 From 684e146039f65ffe62b573093c946994b868caad Mon Sep 17 00:00:00 2001 From: Jiban Prakash Date: Wed, 30 Oct 2013 15:23:52 +0900 Subject: Fixed prevent issue CID:34567 Change-Id: I6ee33e146cbd44040b3088cedffd8835d355a84e Signed-off-by: Jiban Prakash --- am_daemon/amd_appinfo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/am_daemon/amd_appinfo.c b/am_daemon/amd_appinfo.c index 3da4437a..d0187940 100755 --- a/am_daemon/amd_appinfo.c +++ b/am_daemon/amd_appinfo.c @@ -319,6 +319,7 @@ static int __cb(int req_id, const char *pkg_type, } pkgmgrinfo_pkginfo_destroy_pkginfo(handle); } + return ret; } int appinfo_init(struct appinfomgr **cf) -- cgit v1.2.3 From 6d4ee7e900d09813e31e4ffcdc6d84615f5b5242 Mon Sep 17 00:00:00 2001 From: Jaeho Lee Date: Mon, 4 Nov 2013 19:17:24 +0900 Subject: Fix N_SE-57065 bug Signed-off-by: Jaeho Lee --- am_daemon/amd_appinfo.c | 10 ++++++++++ packaging/aul.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/am_daemon/amd_appinfo.c b/am_daemon/amd_appinfo.c index d0187940..5349bd24 100755 --- a/am_daemon/amd_appinfo.c +++ b/am_daemon/amd_appinfo.c @@ -318,6 +318,16 @@ static int __cb(int req_id, const char *pkg_type, return -1; } pkgmgrinfo_pkginfo_destroy_pkginfo(handle); + } else if (strncmp(key,"end", 3) == 0) { + ret = pkgmgrinfo_pkginfo_get_pkginfo(pkgid, &handle); + if (ret != PMINFO_R_OK) + return -1; + ret = pkgmgrinfo_appinfo_get_list(handle, PMINFO_UI_APP, __app_info_insert_handler, user_data); + if (ret != PMINFO_R_OK) { + pkgmgrinfo_pkginfo_destroy_pkginfo(handle); + return -1; + } + pkgmgrinfo_pkginfo_destroy_pkginfo(handle); } return ret; } diff --git a/packaging/aul.spec b/packaging/aul.spec index 3aeee18b..9fcafdc4 100644 --- a/packaging/aul.spec +++ b/packaging/aul.spec @@ -1,6 +1,6 @@ Name: aul Summary: App utility library -Version: 0.0.285 +Version: 0.0.286 Release: 1 Group: System/Libraries License: Apache License, Version 2.0 -- cgit v1.2.3