Unify uiapplication_x and serviceapplication_x 04/48804/3 accepted/tizen/mobile/20151005.055453 accepted/tizen/tv/20151005.055507 accepted/tizen/wearable/20151005.055523 submit/tizen/20151005.030714
authorSangyoon Jang <s89.jang@samsung.com>
Wed, 30 Sep 2015 04:42:26 +0000 (13:42 +0900)
committerSangyoon Jang <s89.jang@samsung.com>
Wed, 30 Sep 2015 06:05:53 +0000 (15:05 +0900)
since they are used in very similar way and also stored in the same table.

Change-Id: I66c1570f3c49ea16e1f051028325c28fa13a81ef
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
include/pkgmgrinfo_basic.h
include/pkgmgrinfo_private.h
parser/pkgmgr_parser.c
parser/pkgmgr_parser_db.c
src/pkgmgrinfo_appinfo.c
src/pkgmgrinfo_basic.c
src/pkgmgrinfo_db.c

index 8e2c24b..5b2ed95 100644 (file)
@@ -296,6 +296,8 @@ typedef struct application_x {
        const char *autorestart;
        const char *taskmanage;
        const char *enabled;
+       const char *categories;
+       const char *extraid;
        const char *hwacceleration;
        const char *screenreader;
        const char *mainapp;
@@ -330,76 +332,6 @@ typedef struct application_x {
        struct application_x *next;
 } application_x;
 
-typedef struct uiapplication_x {
-       const char *appid;
-       const char *exec;
-       const char *nodisplay;
-       const char *multiple;
-       const char *taskmanage;
-       const char *enabled;
-       const char *type;
-       const char *categories;
-       const char *extraid;
-       const char *hwacceleration;
-       const char *screenreader;
-       const char *mainapp;
-       const char *package;
-       const char *recentimage;
-       const char *launchcondition;
-       const char *indicatordisplay;
-       const char *portraitimg;
-       const char *landscapeimg;
-       const char *guestmode_visibility;
-       const char *app_component;
-       const char *permission_type;
-       const char *component_type;
-       const char *preload;
-       const char *submode;
-       const char *submode_mainid;
-       const char *launch_mode;
-       const char *ui_gadget;
-       const char *support_disable;
-       struct label_x *label;
-       struct icon_x *icon;
-       struct image_x *image;
-       struct appsvc_x *appsvc;
-       struct appcontrol_x *appcontrol;
-       struct category_x *category;
-       struct metadata_x *metadata;
-       struct permission_x *permission;
-       struct launchconditions_x *launchconditions;
-       struct notification_x *notification;
-       struct datashare_x *datashare;
-       struct datacontrol_x *datacontrol;
-       struct uiapplication_x *prev;
-       struct uiapplication_x *next;
-
-} uiapplication_x;
-
-typedef struct serviceapplication_x {
-       const char *appid;
-       const char *exec;
-       const char *onboot;
-       const char *autorestart;
-       const char *enabled;
-       const char *type;
-       const char *package;
-       const char *permission_type;
-       struct label_x *label;
-       struct icon_x *icon;
-       struct appsvc_x *appsvc;
-       struct appcontrol_x *appcontrol;
-       struct category_x *category;
-       struct metadata_x *metadata;
-       struct permission_x *permission;
-       struct datacontrol_x *datacontrol;
-       struct launchconditions_x *launchconditions;
-       struct notification_x *notification;
-       struct datashare_x *datashare;
-       struct serviceapplication_x *prev;
-       struct serviceapplication_x *next;
-} serviceapplication_x;
-
 typedef struct daemon_x {
        const char *name;
        const char *text;
@@ -459,8 +391,6 @@ typedef struct package_x {
        struct license_x *license;              /**< package license*/
        struct privileges_x *privileges;        /**< package privileges*/
        struct application_x *application;              /**< package's application*/
-       struct uiapplication_x *uiapplication;          /**< package's ui application*/
-       struct serviceapplication_x *serviceapplication;                /**< package's service application*/
        struct daemon_x *daemon;                /**< package daemon*/
        struct theme_x *theme;          /**< package theme*/
        struct font_x *font;            /**< package font*/
index e4048e4..e41e8c9 100644 (file)
@@ -171,11 +171,7 @@ typedef struct _pkgmgr_appinfo_x {
        const char *package;
        char *locale;
        pkgmgrinfo_app_component app_component;
-       union {
-               uiapplication_x *uiapp_info;
-               serviceapplication_x *svcapp_info;
-               application_x *app_info;
-       };
+       application_x *app_info;
        struct _pkgmgr_appinfo_x *prev;
        struct _pkgmgr_appinfo_x *next;
 } pkgmgr_appinfo_x;
index 6b18a8a..0a78d78 100644 (file)
@@ -119,8 +119,7 @@ static int __ps_process_description(xmlTextReaderPtr reader, description_x *desc
 static int __ps_process_license(xmlTextReaderPtr reader, license_x *license);
 static int __ps_process_appcontrol(xmlTextReaderPtr reader, appcontrol_x *appcontrol);
 static int __ps_process_datacontrol(xmlTextReaderPtr reader, datacontrol_x *datacontrol);
-static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *uiapplication, uid_t uid);
-static int __ps_process_serviceapplication(xmlTextReaderPtr reader, serviceapplication_x *serviceapplication, uid_t uid);
+static int __ps_process_application(xmlTextReaderPtr reader, application_x *application, int type, uid_t uid);
 static int __ps_process_font(xmlTextReaderPtr reader, font_x *font);
 static int __ps_process_theme(xmlTextReaderPtr reader, theme_x *theme);
 static int __ps_process_daemon(xmlTextReaderPtr reader, daemon_x *daemon);
@@ -754,7 +753,7 @@ static int __run_metadata_parser_prestep (manifest_x *mfx, char *md_key, ACTION_
        int ret = -1;
        int tag_exist = 0;
        char buffer[1024] = { 0, };
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        metadata_x *md = NULL;
        char *md_tag = NULL;
 
@@ -767,8 +766,8 @@ static int __run_metadata_parser_prestep (manifest_x *mfx, char *md_key, ACTION_
                return -1;
        }
 
-       while(up != NULL) {
-               md = up->metadata;
+       while (app != NULL) {
+               md = app->metadata;
                while (md != NULL) {
                        //get glist of metadata key and value combination
                        memset(buffer, 0x00, 1024);
@@ -803,7 +802,7 @@ static int __run_metadata_parser_prestep (manifest_x *mfx, char *md_key, ACTION_
 
                //send glist to parser when tags for metadata plugin parser exist.
                if (tag_exist) {
-                       ret = __ps_run_metadata_parser(md_list, md_tag, action, mfx->package, up->appid);
+                       ret = __ps_run_metadata_parser(md_list, md_tag, action, mfx->package, app->appid);
                        if (ret < 0){
                                _LOGD("metadata_parser failed[%d] for tag[%s]\n", ret, md_tag);
                        }
@@ -814,7 +813,7 @@ static int __run_metadata_parser_prestep (manifest_x *mfx, char *md_key, ACTION_
                __metadata_parser_clear_dir_list(md_list);
                md_list = NULL;
                tag_exist = 0;
-               up = up->next;
+               app = app->next;
        }
 
        return 0;
@@ -832,7 +831,7 @@ static int __run_category_parser_prestep (manifest_x *mfx, char *category_key, A
        int ret = -1;
        int tag_exist = 0;
        char buffer[1024] = { 0, };
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        category_x *category = NULL;
        char *category_tag = NULL;
 
@@ -845,8 +844,8 @@ static int __run_category_parser_prestep (manifest_x *mfx, char *category_key, A
                return -1;
        }
 
-       while(up != NULL) {
-               category = up->category;
+       while (app != NULL) {
+               category = app->category;
                while (category != NULL) {
                        //get glist of category key and value combination
                        memset(buffer, 0x00, 1024);
@@ -873,7 +872,7 @@ static int __run_category_parser_prestep (manifest_x *mfx, char *category_key, A
 
                //send glist to parser when tags for metadata plugin parser exist.
                if (tag_exist) {
-                       ret = __ps_run_category_parser(category_list, category_tag, action, mfx->package, up->appid);
+                       ret = __ps_run_category_parser(category_list, category_tag, action, mfx->package, app->appid);
                        if (ret < 0)
                                _LOGD("category_parser failed[%d] for tag[%s]\n", ret, category_tag);
                        else
@@ -882,7 +881,7 @@ static int __run_category_parser_prestep (manifest_x *mfx, char *category_key, A
                __category_parser_clear_dir_list(category_list);
                category_list = NULL;
                tag_exist = 0;
-               up = up->next;
+               app = app->next;
        }
 
        return 0;
@@ -1673,7 +1672,7 @@ static int __ps_process_datacontrol(xmlTextReaderPtr reader, datacontrol_x *data
        return 0;
 }
 
-static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *uiapplication, uid_t uid)
+static int __ps_process_application(xmlTextReaderPtr reader, application_x *application, int type, uid_t uid)
 {
        const xmlChar *node;
        int ret = -1;
@@ -1691,35 +1690,37 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
        permission_x *tmp11 = NULL;
        datacontrol_x *tmp12 = NULL;
 
-       __save_xml_attribute(reader, "appid", &uiapplication->appid, NULL);
-       retvm_if(uiapplication->appid == NULL, PM_PARSER_R_ERROR, "appid cant be NULL, appid field is mandatory\n");
-       __save_xml_attribute(reader, "exec", &uiapplication->exec, NULL);
-       __save_xml_attribute(reader, "nodisplay", &uiapplication->nodisplay, "false");
-       __save_xml_attribute(reader, "multiple", &uiapplication->multiple, "false");
-       __save_xml_attribute(reader, "type", &uiapplication->type, NULL);
-       __save_xml_attribute(reader, "categories", &uiapplication->categories, NULL);
-       __save_xml_attribute(reader, "extraid", &uiapplication->extraid, NULL);
-       __save_xml_attribute(reader, "taskmanage", &uiapplication->taskmanage, "true");
-       __save_xml_attribute(reader, "enabled", &uiapplication->enabled, "true");
-       __save_xml_attribute(reader, "hw-acceleration", &uiapplication->hwacceleration, "default");
-       __save_xml_attribute(reader, "screen-reader", &uiapplication->screenreader, "use-system-setting");
-       __save_xml_attribute(reader, "mainapp", &uiapplication->mainapp, "false");
-       __save_xml_attribute(reader, "recentimage", &uiapplication->recentimage, "false");
-       __save_xml_attribute(reader, "launchcondition", &uiapplication->launchcondition, "false");
-       __save_xml_attribute(reader, "indicatordisplay", &uiapplication->indicatordisplay, "true");
-       __save_xml_attribute(reader, "portrait-effectimage", &uiapplication->portraitimg, NULL);
-       __save_xml_attribute(reader, "landscape-effectimage", &uiapplication->landscapeimg, NULL);
-       __save_xml_attribute(reader, "guestmode-visibility", &uiapplication->guestmode_visibility, "true");
-       __save_xml_attribute(reader, "permission-type", &uiapplication->permission_type, "normal");
-       __save_xml_attribute(reader, "component-type", &uiapplication->component_type, "uiapp");
+       __save_xml_attribute(reader, "appid", &application->appid, NULL);
+       retvm_if(application->appid == NULL, PM_PARSER_R_ERROR, "appid cant be NULL, appid field is mandatory\n");
+       __save_xml_attribute(reader, "exec", &application->exec, NULL);
+       __save_xml_attribute(reader, "nodisplay", &application->nodisplay, "false");
+       __save_xml_attribute(reader, "multiple", &application->multiple, "false");
+       __save_xml_attribute(reader, "type", &application->type, NULL);
+       __save_xml_attribute(reader, "categories", &application->categories, NULL);
+       __save_xml_attribute(reader, "extraid", &application->extraid, NULL);
+       __save_xml_attribute(reader, "taskmanage", &application->taskmanage, "true");
+       __save_xml_attribute(reader, "enabled", &application->enabled, "true");
+       __save_xml_attribute(reader, "hw-acceleration", &application->hwacceleration, "default");
+       __save_xml_attribute(reader, "screen-reader", &application->screenreader, "use-system-setting");
+       __save_xml_attribute(reader, "mainapp", &application->mainapp, "false");
+       __save_xml_attribute(reader, "recentimage", &application->recentimage, "false");
+       __save_xml_attribute(reader, "launchcondition", &application->launchcondition, "false");
+       __save_xml_attribute(reader, "indicatordisplay", &application->indicatordisplay, "true");
+       __save_xml_attribute(reader, "portrait-effectimage", &application->portraitimg, NULL);
+       __save_xml_attribute(reader, "landscape-effectimage", &application->landscapeimg, NULL);
+       __save_xml_attribute(reader, "guestmode-visibility", &application->guestmode_visibility, "true");
+       __save_xml_attribute(reader, "permission-type", &application->permission_type, "normal");
+       __save_xml_attribute(reader, "component-type", &application->component_type, type == PMINFO_UI_APP ? "uiapp" : "svcapp");
        /*component_type has "svcapp" or "uiapp", if it is not, parsing manifest is fail*/
-       retvm_if(((strcmp(uiapplication->component_type, "svcapp") != 0) && (strcmp(uiapplication->component_type, "uiapp") != 0) && (strcmp(uiapplication->component_type, "widgetapp") != 0)), PM_PARSER_R_ERROR, "invalid component_type[%s]\n", uiapplication->component_type);
-       __save_xml_attribute(reader, "submode", &uiapplication->submode, "false");
-       __save_xml_attribute(reader, "submode-mainid", &uiapplication->submode_mainid, NULL);
-       __save_xml_attribute(reader, "launch_mode", &uiapplication->launch_mode, "caller");
-       __save_xml_attribute(reader, "ui-gadget", &uiapplication->ui_gadget, "false");
+       retvm_if(((strcmp(application->component_type, "svcapp") != 0) && (strcmp(application->component_type, "uiapp") != 0) && (strcmp(application->component_type, "widgetapp") != 0)), PM_PARSER_R_ERROR, "invalid component_type[%s]", application->component_type);
+       __save_xml_attribute(reader, "submode", &application->submode, "false");
+       __save_xml_attribute(reader, "submode-mainid", &application->submode_mainid, NULL);
+       __save_xml_attribute(reader, "launch_mode", &application->launch_mode, "caller");
+       __save_xml_attribute(reader, "ui-gadget", &application->ui_gadget, "false");
+       __save_xml_attribute(reader, "auto-restart", &application->autorestart, "false");
+       __save_xml_attribute(reader, "on-boot", &application->onboot, "false");
 
-       uiapplication->package= strdup(package);
+       application->package= strdup(package);
 
        depth = xmlTextReaderDepth(reader);
        while ((ret = __next_child_element(reader, depth))) {
@@ -1735,7 +1736,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(label, '\0', sizeof(label_x));
-                       LISTADD(uiapplication->label, label);
+                       LISTADD(application->label, label);
                        ret = __ps_process_label(reader, label);
                } else if (!strcmp(ASCII(node), "icon")) {
                        icon_x *icon = malloc(sizeof(icon_x));
@@ -1744,7 +1745,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(icon, '\0', sizeof(icon_x));
-                       LISTADD(uiapplication->icon, icon);
+                       LISTADD(application->icon, icon);
                        ret = __ps_process_icon(reader, icon, uid);
                } else if (!strcmp(ASCII(node), "image")) {
                        image_x *image = malloc(sizeof(image_x));
@@ -1753,7 +1754,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(image, '\0', sizeof(image_x));
-                       LISTADD(uiapplication->image, image);
+                       LISTADD(application->image, image);
                        ret = __ps_process_image(reader, image);
                } else if (!strcmp(ASCII(node), "category")) {
                        category_x *category = malloc(sizeof(category_x));
@@ -1762,7 +1763,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(category, '\0', sizeof(category_x));
-                       LISTADD(uiapplication->category, category);
+                       LISTADD(application->category, category);
                        ret = __ps_process_category(reader, category);
                } else if (!strcmp(ASCII(node), "metadata")) {
                        metadata_x *metadata = malloc(sizeof(metadata_x));
@@ -1771,7 +1772,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(metadata, '\0', sizeof(metadata_x));
-                       LISTADD(uiapplication->metadata, metadata);
+                       LISTADD(application->metadata, metadata);
                        ret = __ps_process_metadata(reader, metadata);
                } else if (!strcmp(ASCII(node), "permission")) {
                        permission_x *permission = malloc(sizeof(permission_x));
@@ -1780,7 +1781,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(permission, '\0', sizeof(permission_x));
-                       LISTADD(uiapplication->permission, permission);
+                       LISTADD(application->permission, permission);
                        ret = __ps_process_permission(reader, permission);
                } else if (!strcmp(ASCII(node), "app-control")) {
                        appcontrol_x *appcontrol = malloc(sizeof(appcontrol_x));
@@ -1789,7 +1790,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(appcontrol, '\0', sizeof(appcontrol_x));
-                       LISTADD(uiapplication->appcontrol, appcontrol);
+                       LISTADD(application->appcontrol, appcontrol);
                        ret = __ps_process_appcontrol(reader, appcontrol);
                } else if (!strcmp(ASCII(node), "application-service")) {
                        appsvc_x *appsvc = malloc(sizeof(appsvc_x));
@@ -1798,7 +1799,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(appsvc, '\0', sizeof(appsvc_x));
-                       LISTADD(uiapplication->appsvc, appsvc);
+                       LISTADD(application->appsvc, appsvc);
                        ret = __ps_process_appsvc(reader, appsvc);
                } else if (!strcmp(ASCII(node), "data-share")) {
                        datashare_x *datashare = malloc(sizeof(datashare_x));
@@ -1807,7 +1808,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(datashare, '\0', sizeof(datashare_x));
-                       LISTADD(uiapplication->datashare, datashare);
+                       LISTADD(application->datashare, datashare);
                        ret = __ps_process_datashare(reader, datashare);
                } else if (!strcmp(ASCII(node), "launch-conditions")) {
                        launchconditions_x *launchconditions = malloc(sizeof(launchconditions_x));
@@ -1816,7 +1817,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(launchconditions, '\0', sizeof(launchconditions_x));
-                       LISTADD(uiapplication->launchconditions, launchconditions);
+                       LISTADD(application->launchconditions, launchconditions);
                        ret = __ps_process_launchconditions(reader, launchconditions);
                } else if (!strcmp(ASCII(node), "notification")) {
                        notification_x *notification = malloc(sizeof(notification_x));
@@ -1825,7 +1826,7 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(notification, '\0', sizeof(notification_x));
-                       LISTADD(uiapplication->notification, notification);
+                       LISTADD(application->notification, notification);
                        ret = __ps_process_notification(reader, notification);
                } else if (!strcmp(ASCII(node), "datacontrol")) {
                        datacontrol_x *datacontrol = malloc(sizeof(datacontrol_x));
@@ -1834,254 +1835,63 @@ static int __ps_process_uiapplication(xmlTextReaderPtr reader, uiapplication_x *
                                return -1;
                        }
                        memset(datacontrol, '\0', sizeof(datacontrol_x));
-                       LISTADD(uiapplication->datacontrol, datacontrol);
+                       LISTADD(application->datacontrol, datacontrol);
                        ret = __ps_process_datacontrol(reader, datacontrol);
                } else
                        return -1;
                if (ret < 0) {
-                       _LOGD("Processing uiapplication failed\n");
+                       _LOGD("Processing application failed\n");
                        return ret;
                }
        }
 
-       if (uiapplication->label) {
-               LISTHEAD(uiapplication->label, tmp1);
-               uiapplication->label = tmp1;
+       if (application->label) {
+               LISTHEAD(application->label, tmp1);
+               application->label = tmp1;
        }
-       if (uiapplication->icon) {
-               LISTHEAD(uiapplication->icon, tmp2);
-               uiapplication->icon = tmp2;
+       if (application->icon) {
+               LISTHEAD(application->icon, tmp2);
+               application->icon = tmp2;
        }
-       if (uiapplication->appsvc) {
-               LISTHEAD(uiapplication->appsvc, tmp3);
-               uiapplication->appsvc = tmp3;
+       if (application->appsvc) {
+               LISTHEAD(application->appsvc, tmp3);
+               application->appsvc = tmp3;
        }
-       if (uiapplication->appcontrol) {
-               LISTHEAD(uiapplication->appcontrol, tmp4);
-               uiapplication->appcontrol = tmp4;
+       if (application->appcontrol) {
+               LISTHEAD(application->appcontrol, tmp4);
+               application->appcontrol = tmp4;
        }
-       if (uiapplication->launchconditions) {
-               LISTHEAD(uiapplication->launchconditions, tmp5);
-               uiapplication->launchconditions = tmp5;
+       if (application->launchconditions) {
+               LISTHEAD(application->launchconditions, tmp5);
+               application->launchconditions = tmp5;
        }
-       if (uiapplication->notification) {
-               LISTHEAD(uiapplication->notification, tmp6);
-               uiapplication->notification = tmp6;
+       if (application->notification) {
+               LISTHEAD(application->notification, tmp6);
+               application->notification = tmp6;
        }
-       if (uiapplication->datashare) {
-               LISTHEAD(uiapplication->datashare, tmp7);
-               uiapplication->datashare = tmp7;
+       if (application->datashare) {
+               LISTHEAD(application->datashare, tmp7);
+               application->datashare = tmp7;
        }
-       if (uiapplication->category) {
-               LISTHEAD(uiapplication->category, tmp8);
-               uiapplication->category = tmp8;
+       if (application->category) {
+               LISTHEAD(application->category, tmp8);
+               application->category = tmp8;
        }
-       if (uiapplication->metadata) {
-               LISTHEAD(uiapplication->metadata, tmp9);
-               uiapplication->metadata = tmp9;
+       if (application->metadata) {
+               LISTHEAD(application->metadata, tmp9);
+               application->metadata = tmp9;
        }
-       if (uiapplication->image) {
-               LISTHEAD(uiapplication->image, tmp10);
-               uiapplication->image = tmp10;
+       if (application->image) {
+               LISTHEAD(application->image, tmp10);
+               application->image = tmp10;
        }
-       if (uiapplication->permission) {
-               LISTHEAD(uiapplication->permission, tmp11);
-               uiapplication->permission = tmp11;
+       if (application->permission) {
+               LISTHEAD(application->permission, tmp11);
+               application->permission = tmp11;
        }
-       if (uiapplication->datacontrol) {
-               LISTHEAD(uiapplication->datacontrol, tmp12);
-               uiapplication->datacontrol = tmp12;
-       }
-
-       return ret;
-}
-
-static int __ps_process_serviceapplication(xmlTextReaderPtr reader, serviceapplication_x *serviceapplication, uid_t uid)
-{
-       const xmlChar *node;
-       int ret = -1;
-       int depth = -1;
-       label_x *tmp1 = NULL;
-       icon_x *tmp2 = NULL;
-       appsvc_x *tmp3 = NULL;
-       appcontrol_x *tmp4 = NULL;
-       datacontrol_x *tmp5 = NULL;
-       launchconditions_x *tmp6 = NULL;
-       notification_x *tmp7 = NULL;
-       datashare_x *tmp8 = NULL;
-       category_x *tmp9 = NULL;
-       metadata_x *tmp10 = NULL;
-       permission_x *tmp11 = NULL;
-
-       __save_xml_attribute(reader, "appid", &serviceapplication->appid, NULL);
-       retvm_if(serviceapplication->appid == NULL, PM_PARSER_R_ERROR, "appid cant be NULL, appid field is mandatory\n");
-       __save_xml_attribute(reader, "exec", &serviceapplication->exec, NULL);
-       __save_xml_attribute(reader, "type", &serviceapplication->type, NULL);
-       __save_xml_attribute(reader, "enabled", &serviceapplication->enabled, "true");
-       __save_xml_attribute(reader, "permission-type", &serviceapplication->permission_type, "normal");
-       __save_xml_attribute(reader, "auto-restart", &serviceapplication->autorestart, "false");
-       __save_xml_attribute(reader, "on-boot", &serviceapplication->onboot, "false");
-
-       serviceapplication->package= strdup(package);
-
-       depth = xmlTextReaderDepth(reader);
-       while ((ret = __next_child_element(reader, depth))) {
-               node = xmlTextReaderConstName(reader);
-               if (!node) {
-                       _LOGD("xmlTextReaderConstName value is NULL\n");
-                       return -1;
-               }
-
-               if (!strcmp(ASCII(node), "label")) {
-                       label_x *label = malloc(sizeof(label_x));
-                       if (label == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(label, '\0', sizeof(label_x));
-                       LISTADD(serviceapplication->label, label);
-                       ret = __ps_process_label(reader, label);
-               } else if (!strcmp(ASCII(node), "icon")) {
-                       icon_x *icon = malloc(sizeof(icon_x));
-                       if (icon == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(icon, '\0', sizeof(icon_x));
-                       LISTADD(serviceapplication->icon, icon);
-                       ret = __ps_process_icon(reader, icon, uid);
-               } else if (!strcmp(ASCII(node), "category")) {
-                       category_x *category = malloc(sizeof(category_x));
-                       if (category == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(category, '\0', sizeof(category_x));
-                       LISTADD(serviceapplication->category, category);
-                       ret = __ps_process_category(reader, category);
-               } else if (!strcmp(ASCII(node), "metadata")) {
-                       metadata_x *metadata = malloc(sizeof(metadata_x));
-                       if (metadata == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(metadata, '\0', sizeof(metadata_x));
-                       LISTADD(serviceapplication->metadata, metadata);
-                       ret = __ps_process_metadata(reader, metadata);
-               } else if (!strcmp(ASCII(node), "permission")) {
-                       permission_x *permission = malloc(sizeof(permission_x));
-                       if (permission == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(permission, '\0', sizeof(permission_x));
-                       LISTADD(serviceapplication->permission, permission);
-                       ret = __ps_process_permission(reader, permission);
-               } else if (!strcmp(ASCII(node), "app-control")) {
-                       appcontrol_x *appcontrol = malloc(sizeof(appcontrol_x));
-                       if (appcontrol == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(appcontrol, '\0', sizeof(appcontrol_x));
-                       LISTADD(serviceapplication->appcontrol, appcontrol);
-                       ret = __ps_process_appcontrol(reader, appcontrol);
-               } else if (!strcmp(ASCII(node), "application-service")) {
-                       appsvc_x *appsvc = malloc(sizeof(appsvc_x));
-                       if (appsvc == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(appsvc, '\0', sizeof(appsvc_x));
-                       LISTADD(serviceapplication->appsvc, appsvc);
-                       ret = __ps_process_appsvc(reader, appsvc);
-               } else if (!strcmp(ASCII(node), "data-share")) {
-                       datashare_x *datashare = malloc(sizeof(datashare_x));
-                       if (datashare == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(datashare, '\0', sizeof(datashare_x));
-                       LISTADD(serviceapplication->datashare, datashare);
-                       ret = __ps_process_datashare(reader, datashare);
-               } else if (!strcmp(ASCII(node), "launch-conditions")) {
-                       launchconditions_x *launchconditions = malloc(sizeof(launchconditions_x));
-                       if (launchconditions == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(launchconditions, '\0', sizeof(launchconditions_x));
-                       LISTADD(serviceapplication->launchconditions, launchconditions);
-                       ret = __ps_process_launchconditions(reader, launchconditions);
-               } else if (!strcmp(ASCII(node), "notification")) {
-                       notification_x *notification = malloc(sizeof(notification_x));
-                       if (notification == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(notification, '\0', sizeof(notification_x));
-                       LISTADD(serviceapplication->notification, notification);
-                       ret = __ps_process_notification(reader, notification);
-               } else if (!strcmp(ASCII(node), "datacontrol")) {
-                       datacontrol_x *datacontrol = malloc(sizeof(datacontrol_x));
-                       if (datacontrol == NULL) {
-                               _LOGD("Malloc Failed\n");
-                               return -1;
-                       }
-                       memset(datacontrol, '\0', sizeof(datacontrol_x));
-                       LISTADD(serviceapplication->datacontrol, datacontrol);
-                       ret = __ps_process_datacontrol(reader, datacontrol);
-               } else
-                       return -1;
-               if (ret < 0) {
-                       _LOGD("Processing serviceapplication failed\n");
-                       return ret;
-               }
-       }
-
-       if (serviceapplication->label) {
-               LISTHEAD(serviceapplication->label, tmp1);
-               serviceapplication->label = tmp1;
-       }
-       if (serviceapplication->icon) {
-               LISTHEAD(serviceapplication->icon, tmp2);
-               serviceapplication->icon = tmp2;
-       }
-       if (serviceapplication->appsvc) {
-               LISTHEAD(serviceapplication->appsvc, tmp3);
-               serviceapplication->appsvc = tmp3;
-       }
-       if (serviceapplication->appcontrol) {
-               LISTHEAD(serviceapplication->appcontrol, tmp4);
-               serviceapplication->appcontrol = tmp4;
-       }
-       if (serviceapplication->datacontrol) {
-               LISTHEAD(serviceapplication->datacontrol, tmp5);
-               serviceapplication->datacontrol = tmp5;
-       }
-       if (serviceapplication->launchconditions) {
-               LISTHEAD(serviceapplication->launchconditions, tmp6);
-               serviceapplication->launchconditions = tmp6;
-       }
-       if (serviceapplication->notification) {
-               LISTHEAD(serviceapplication->notification, tmp7);
-               serviceapplication->notification = tmp7;
-       }
-       if (serviceapplication->datashare) {
-               LISTHEAD(serviceapplication->datashare, tmp8);
-               serviceapplication->datashare = tmp8;
-       }
-       if (serviceapplication->category) {
-               LISTHEAD(serviceapplication->category, tmp9);
-               serviceapplication->category = tmp9;
-       }
-       if (serviceapplication->metadata) {
-               LISTHEAD(serviceapplication->metadata, tmp10);
-               serviceapplication->metadata = tmp10;
-       }
-       if (serviceapplication->permission) {
-               LISTHEAD(serviceapplication->permission, tmp11);
-               serviceapplication->permission = tmp11;
+       if (application->datacontrol) {
+               LISTHEAD(application->datacontrol, tmp12);
+               application->datacontrol = tmp12;
        }
 
        return ret;
@@ -2127,8 +1937,7 @@ static int __start_process(xmlTextReaderPtr reader, manifest_x * mfx, uid_t uid)
        author_x *tmp2 = NULL;
        description_x *tmp3 = NULL;
        license_x *tmp4 = NULL;
-       uiapplication_x *tmp5 = NULL;
-       serviceapplication_x *tmp6 = NULL;
+       application_x *tmp5 = NULL;
        daemon_x *tmp7 = NULL;
        theme_x *tmp8 = NULL;
        font_x *tmp9 = NULL;
@@ -2192,23 +2001,23 @@ static int __start_process(xmlTextReaderPtr reader, manifest_x * mfx, uid_t uid)
                        LISTADD(mfx->privileges, privileges);
                        ret = __ps_process_privileges(reader, privileges);
                } else if (!strcmp(ASCII(node), "ui-application")) {
-                       uiapplication_x *uiapplication = malloc(sizeof(uiapplication_x));
-                       if (uiapplication == NULL) {
+                       application_x *application = malloc(sizeof(application_x));
+                       if (application == NULL) {
                                _LOGD("Malloc Failed\n");
                                return -1;
                        }
-                       memset(uiapplication, '\0', sizeof(uiapplication_x));
-                       LISTADD(mfx->uiapplication, uiapplication);
-                       ret = __ps_process_uiapplication(reader, uiapplication, uid);
+                       memset(application, '\0', sizeof(application_x));
+                       LISTADD(mfx->application, application);
+                       ret = __ps_process_application(reader, application, PMINFO_UI_APP, uid);
                } else if (!strcmp(ASCII(node), "service-application")) {
-                       serviceapplication_x *serviceapplication = malloc(sizeof(serviceapplication_x));
-                       if (serviceapplication == NULL) {
+                       application_x *application = malloc(sizeof(application_x));
+                       if (application == NULL) {
                                _LOGD("Malloc Failed\n");
                                return -1;
                        }
-                       memset(serviceapplication, '\0', sizeof(serviceapplication_x));
-                       LISTADD(mfx->serviceapplication, serviceapplication);
-                       ret = __ps_process_serviceapplication(reader, serviceapplication, uid);
+                       memset(application, '\0', sizeof(application_x));
+                       LISTADD(mfx->application, application);
+                       ret = __ps_process_application(reader, application, PMINFO_SVC_APP, uid);
                } else if (!strcmp(ASCII(node), "daemon")) {
                        daemon_x *daemon = malloc(sizeof(daemon_x));
                        if (daemon == NULL) {
@@ -2310,13 +2119,9 @@ static int __start_process(xmlTextReaderPtr reader, manifest_x * mfx, uid_t uid)
                LISTHEAD(mfx->license, tmp4);
                mfx->license= tmp4;
        }
-       if (mfx->uiapplication) {
-               LISTHEAD(mfx->uiapplication, tmp5);
-               mfx->uiapplication = tmp5;
-       }
-       if (mfx->serviceapplication) {
-               LISTHEAD(mfx->serviceapplication, tmp6);
-               mfx->serviceapplication = tmp6;
+       if (mfx->application) {
+               LISTHEAD(mfx->application, tmp5);
+               mfx->application = tmp5;
        }
        if (mfx->daemon) {
                LISTHEAD(mfx->daemon, tmp7);
@@ -2403,7 +2208,7 @@ static int __ps_remove_appsvc_db(manifest_x *mfx, uid_t uid)
        void *lib_handle = NULL;
        int (*appsvc_operation) (const char *, uid_t);
        int ret = 0;
-       uiapplication_x *uiapplication = mfx->uiapplication;
+       application_x *application = mfx->application;
 
        if ((lib_handle = dlopen(LIBAPPSVC_PATH, RTLD_LAZY)) == NULL) {
                _LOGE("dlopen is failed LIBAPPSVC_PATH[%s]\n", LIBAPPSVC_PATH);
@@ -2416,8 +2221,8 @@ static int __ps_remove_appsvc_db(manifest_x *mfx, uid_t uid)
                goto END;
        }
 
-       for(; uiapplication; uiapplication=uiapplication->next) {
-               ret = appsvc_operation(uiapplication->appid, uid);
+       for (; application; application = application->next) {
+               ret = appsvc_operation(application->appid, uid);
                if (ret <0)
                        _LOGE("can not operation  symbol \n");
        }
index 7bd09de..2c8daa5 100644 (file)
@@ -266,24 +266,15 @@ sqlite3 *pkgmgr_cert_db;
                                                "REFERENCES package_app_info(app_id) " \
                                                "ON DELETE CASCADE)"
 
-static int __insert_uiapplication_info(manifest_x *mfx);
-static int __insert_serviceapplication_info(manifest_x *mfx);
-static int __insert_uiapplication_appsvc_info(manifest_x *mfx);
-static int __insert_serviceapplication_appsvc_info(manifest_x *mfx);
-static int __insert_uiapplication_appcategory_info(manifest_x *mfx);
-static int __insert_serviceapplication_appcategory_info(manifest_x *mfx);
-static int __insert_uiapplication_appcontrol_info(manifest_x *mfx);
-static int __insert_serviceapplication_appmetadata_info(manifest_x *mfx);
-static int __insert_uiapplication_appmetadata_info(manifest_x *mfx);
-static int __insert_serviceapplication_appcontrol_info(manifest_x *mfx);
-static int __insert_uiapplication_share_allowed_info(manifest_x *mfx);
-static int __insert_serviceapplication_share_allowed_info(manifest_x *mfx);
-static int __insert_uiapplication_share_request_info(manifest_x *mfx);
-static int __insert_serviceapplication_share_request_info(manifest_x *mfx);
-static int __insert_uiapplication_datacontrol_info(manifest_x *mfx);
-static int __insert_serviceapplication_datacontrol_info(manifest_x *mfx);
-static void __insert_serviceapplication_locale_info(gpointer data, gpointer userdata);
-static void __insert_uiapplication_locale_info(gpointer data, gpointer userdata);
+static int __insert_application_info(manifest_x *mfx);
+static int __insert_application_appsvc_info(manifest_x *mfx);
+static int __insert_application_appcategory_info(manifest_x *mfx);
+static int __insert_application_appcontrol_info(manifest_x *mfx);
+static int __insert_application_appmetadata_info(manifest_x *mfx);
+static int __insert_application_share_allowed_info(manifest_x *mfx);
+static int __insert_application_share_request_info(manifest_x *mfx);
+static int __insert_application_datacontrol_info(manifest_x *mfx);
+static void __insert_application_locale_info(gpointer data, gpointer userdata);
 static void __insert_pkglocale_info(gpointer data, gpointer userdata);
 static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid);
 static int __delete_manifest_info_from_db(manifest_x *mfx, uid_t uid);
@@ -339,10 +330,10 @@ static int __guestmode_visibility_cb(void *data, int ncols, char **coltxt, char
        int i = 0;
        char *appid = NULL;
        char *status = NULL;
-       uiapplication_x *uiapp = NULL;
+       application_x *app = NULL;
        for(i = 0; i < ncols; i++)
        {
-               uiapp = mfx->uiapplication;
+               app = mfx->application;
                if (strcmp(colname[i], "app_id") == 0) {
                        if (coltxt[i])
                                appid = strdup(coltxt[i]);
@@ -356,10 +347,10 @@ static int __guestmode_visibility_cb(void *data, int ncols, char **coltxt, char
                return -1;
        }
        /*update guest mode visibility*/
-       for (; uiapp != NULL; uiapp = uiapp->next) {
-               if (strcmp(uiapp->appid, appid) == 0) {
-                       free((void *)uiapp->guestmode_visibility);
-                       uiapp->guestmode_visibility = strdup(status);
+       for (; app != NULL; app = app->next) {
+               if (strcmp(app->appid, appid) == 0) {
+                       free((void *)app->guestmode_visibility);
+                       app->guestmode_visibility = strdup(status);
                        break;
                }
        }
@@ -653,34 +644,34 @@ static void __insert_pkglocale_info(gpointer data, gpointer userdata)
                _LOGD("Package Localized Info DB Insert failed\n");
 }
 
-static void __insert_uiapplication_locale_info(gpointer data, gpointer userdata)
+static void __insert_application_locale_info(gpointer data, gpointer userdata)
 {
        int ret = -1;
        char *label = NULL;
        char *icon = NULL;
        char query[MAX_QUERY_LEN] = {'\0'};
 
-       uiapplication_x *up = (uiapplication_x*)userdata;
-       label_x *lbl = up->label;
-       icon_x *icn = up->icon;
+       application_x *app = (application_x*)userdata;
+       label_x *lbl = app->label;
+       icon_x *icn = app->icon;
 
        __extract_data(data, lbl, NULL, icn, NULL, NULL, &label, NULL, &icon, NULL, NULL);
        if (!label && !icon)
                return;
        sqlite3_snprintf(MAX_QUERY_LEN, query, "insert into package_app_localized_info(app_id, app_locale, " \
                "app_label, app_icon) values " \
-               "('%q', '%q', '%q', '%q')", up->appid, (char*)data,
+               "('%q', '%q', '%q', '%q')", app->appid, (char*)data,
                label, icon);
        ret = __exec_query(query);
        if (ret == -1)
                _LOGD("Package UiApp Localized Info DB Insert failed\n");
 
        /*insert ui app locale info to pkg locale to get mainapp data */
-       if (strcasecmp(up->mainapp, "true")==0) {
+       if (strcasecmp(app->mainapp, "true")==0) {
                sqlite3_snprintf(MAX_QUERY_LEN, query, "insert into package_localized_info(package, package_locale, " \
                        "package_label, package_icon, package_description, package_license, package_author) values " \
                        "('%q', '%q', '%q', '%q', '%q', '%q', '%q')",
-                       up->package,
+                       app->package,
                        (char*)data,
                        label,
                        icon,
@@ -692,28 +683,28 @@ static void __insert_uiapplication_locale_info(gpointer data, gpointer userdata)
 
                if (icon != NULL) {
                        sqlite3_snprintf(MAX_QUERY_LEN, query, "update package_localized_info set package_icon='%s' "\
-                               "where package='%s' and package_locale='%s'", icon, up->package, (char*)data);
+                               "where package='%s' and package_locale='%s'", icon, app->package, (char*)data);
                        ret = __exec_query_no_msg(query);
                }
        }
 }
 
-static void __insert_uiapplication_icon_section_info(gpointer data, gpointer userdata)
+static void __insert_application_icon_section_info(gpointer data, gpointer userdata)
 {
        int ret = -1;
        char *icon = NULL;
        char *resolution = NULL;
        char query[MAX_QUERY_LEN] = {'\0'};
 
-       uiapplication_x *up = (uiapplication_x*)userdata;
-       icon_x *icn = up->icon;
+       application_x *app = (application_x*)userdata;
+       icon_x *icn = app->icon;
 
        __extract_icon_data(data, icn, &icon, &resolution);
        if (!icon && !resolution)
                return;
        sqlite3_snprintf(MAX_QUERY_LEN, query, "insert into package_app_icon_section_info(app_id, " \
                "app_icon, app_icon_section, app_icon_resolution) values " \
-               "('%q', '%q', '%q', '%q')", up->appid,
+               "('%q', '%q', '%q', '%q')", app->appid,
                icon, (char*)data, resolution);
 
        ret = __exec_query(query);
@@ -722,22 +713,22 @@ static void __insert_uiapplication_icon_section_info(gpointer data, gpointer use
 
 }
 
-static void __insert_uiapplication_image_info(gpointer data, gpointer userdata)
+static void __insert_application_image_info(gpointer data, gpointer userdata)
 {
        int ret = -1;
        char *lang = NULL;
        char *img = NULL;
        char query[MAX_QUERY_LEN] = {'\0'};
 
-       uiapplication_x *up = (uiapplication_x*)userdata;
-       image_x *image = up->image;
+       application_x *app = (application_x*)userdata;
+       image_x *image = app->image;
 
        __extract_image_data(data, image, &lang, &img);
        if (!lang && !img)
                return;
        sqlite3_snprintf(MAX_QUERY_LEN, query, "insert into package_app_image_info(app_id, app_locale, " \
                "app_image_section, app_image) values " \
-               "('%q', '%q', '%q', '%q')", up->appid, lang, (char*)data, img);
+               "('%q', '%q', '%q', '%q')", app->appid, lang, (char*)data, img);
 
        ret = __exec_query(query);
        if (ret == -1)
@@ -746,54 +737,30 @@ static void __insert_uiapplication_image_info(gpointer data, gpointer userdata)
 }
 
 
-static void __insert_serviceapplication_locale_info(gpointer data, gpointer userdata)
+static int __insert_mainapp_info(manifest_x *mfx)
 {
-       int ret = -1;
-       char *icon = NULL;
-       char *label = NULL;
-       char query[MAX_QUERY_LEN] = {'\0'};
-
-       serviceapplication_x *sp = (serviceapplication_x*)userdata;
-       label_x *lbl = sp->label;
-       icon_x *icn = sp->icon;
-
-       __extract_data(data, lbl, NULL, icn, NULL, NULL, &label, NULL, &icon, NULL, NULL);
-       if (!icon && !label)
-               return;
-       sqlite3_snprintf(MAX_QUERY_LEN, query, "insert into package_app_localized_info(app_id, app_locale, " \
-               "app_label, app_icon) values " \
-               "('%q', '%q', '%q', '%q')", sp->appid, (char*)data,
-               label, icon);
-       ret = __exec_query(query);
-       if (ret == -1)
-               _LOGD("Package ServiceApp Localized Info DB Insert failed\n");
-}
-
-static int __insert_ui_mainapp_info(manifest_x *mfx)
-{
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        int ret = -1;
        char query[MAX_QUERY_LEN] = {'\0'};
-       while(up != NULL)
-       {
+       while (app != NULL) {
                snprintf(query, MAX_QUERY_LEN,
-                       "update package_app_info set app_mainapp='%s' where app_id='%s'", up->mainapp, up->appid);
+                       "update package_app_info set app_mainapp='%s' where app_id='%s'", app->mainapp, app->appid);
 
                ret = __exec_query(query);
                if (ret == -1) {
-                       _LOGD("Package UiApp Info DB Insert Failed\n");
+                       _LOGD("Package App Info DB Insert Failed\n");
                        return -1;
                }
-               if (strcasecmp(up->mainapp, "True")==0)
-                       mfx->mainapp_id = strdup(up->appid);
+               if (strcasecmp(app->mainapp, "True")==0)
+                       mfx->mainapp_id = strdup(app->appid);
 
-               up = up->next;
+               app = app->next;
                memset(query, '\0', MAX_QUERY_LEN);
        }
 
-       if (mfx->mainapp_id == NULL){
-               if (mfx->uiapplication && mfx->uiapplication->appid) {
-                       snprintf(query, MAX_QUERY_LEN, "update package_app_info set app_mainapp='true' where app_id='%s'", mfx->uiapplication->appid);
+       if (mfx->mainapp_id == NULL) {
+               if (mfx->application && mfx->application->appid) {
+                       snprintf(query, MAX_QUERY_LEN, "update package_app_info set app_mainapp='true' where app_id='%s'", mfx->application->appid);
                } else {
                        _LOGD("Not valid appid\n");
                        return -1;
@@ -805,9 +772,9 @@ static int __insert_ui_mainapp_info(manifest_x *mfx)
                        return -1;
                }
 
-               free((void *)mfx->uiapplication->mainapp);
-               mfx->uiapplication->mainapp= strdup("true");
-               mfx->mainapp_id = strdup(mfx->uiapplication->appid);
+               free((void *)mfx->application->mainapp);
+               mfx->application->mainapp= strdup("true");
+               mfx->mainapp_id = strdup(mfx->application->appid);
        }
 
        memset(query, '\0', MAX_QUERY_LEN);
@@ -822,48 +789,47 @@ static int __insert_ui_mainapp_info(manifest_x *mfx)
        return 0;
 }
 /* _PRODUCT_LAUNCHING_ENHANCED_
-*  up->indicatordisplay, up->portraitimg, up->landscapeimg, up->guestmode_appstatus
+*  app->indicatordisplay, app->portraitimg, app->landscapeimg, app->guestmode_appstatus
 */
-static int __insert_uiapplication_info(manifest_x *mfx)
+static int __insert_application_info(manifest_x *mfx)
 {
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        int ret = -1;
        char query[MAX_QUERY_LEN] = {'\0'};
-       while(up != NULL)
-       {
+       while (app != NULL) {
                snprintf(query, MAX_QUERY_LEN,
                         "insert into package_app_info(app_id, app_component, app_exec, app_nodisplay, app_type, app_onboot, " \
                        "app_multiple, app_autorestart, app_taskmanage, app_enabled, app_hwacceleration, app_screenreader, app_mainapp , app_recentimage, " \
                        "app_launchcondition, app_indicatordisplay, app_portraitimg, app_landscapeimg, app_guestmodevisibility, app_permissiontype, "\
                        "app_preload, app_submode, app_submode_mainid, app_launch_mode, app_ui_gadget, app_support_disable, component_type, package) " \
                        "values('%s', '%s', '%s', '%s', '%s', '%s', '%s','%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",\
-                        up->appid,
-                        "uiapp",
-                        up->exec,
-                        up->nodisplay,
-                        up->type,
-                        "false",
-                        up->multiple,
-                        "false",
-                        up->taskmanage,
-                        up->enabled,
-                        up->hwacceleration,
-                        up->screenreader,
-                        up->mainapp,
-                        __get_str(up->recentimage),
-                        up->launchcondition,
-                        up->indicatordisplay,
-                        __get_str(up->portraitimg),
-                        __get_str(up->landscapeimg),
-                        up->guestmode_visibility,
-                        up->permission_type,
+                        app->appid,
+                        app->component_type,
+                        app->exec,
+                        app->nodisplay,
+                        app->type,
+                        app->onboot,
+                        app->multiple,
+                        app->autorestart,
+                        app->taskmanage,
+                        app->enabled,
+                        app->hwacceleration,
+                        app->screenreader,
+                        app->mainapp,
+                        __get_str(app->recentimage),
+                        app->launchcondition,
+                        app->indicatordisplay,
+                        __get_str(app->portraitimg),
+                        __get_str(app->landscapeimg),
+                        app->guestmode_visibility,
+                        app->permission_type,
                         mfx->preload,
-                        up->submode,
-                        __get_str(up->submode_mainid),
-                        up->launch_mode,
-                        up->ui_gadget,
+                        app->submode,
+                        __get_str(app->submode_mainid),
+                        app->launch_mode,
+                        app->ui_gadget,
                         mfx->support_disable,
-                        up->component_type,
+                        app->component_type,
                         mfx->package);
 
                ret = __exec_query(query);
@@ -871,27 +837,25 @@ static int __insert_uiapplication_info(manifest_x *mfx)
                        _LOGD("Package UiApp Info DB Insert Failed\n");
                        return -1;
                }
-               up = up->next;
+               app = app->next;
                memset(query, '\0', MAX_QUERY_LEN);
        }
        return 0;
 }
 
-static int __insert_uiapplication_appcategory_info(manifest_x *mfx)
+static int __insert_application_appcategory_info(manifest_x *mfx)
 {
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        category_x *ct = NULL;
        int ret = -1;
        char query[MAX_QUERY_LEN] = {'\0'};
-       while(up != NULL)
-       {
-               ct = up->category;
-               while (ct != NULL)
-               {
+       while (app != NULL) {
+               ct = app->category;
+               while (ct != NULL) {
                        snprintf(query, MAX_QUERY_LEN,
                                "insert into package_app_app_category(app_id, category) " \
                                "values('%s','%s')",\
-                                up->appid, ct->name);
+                                app->appid, ct->name);
                        ret = __exec_query(query);
                        if (ret == -1) {
                                _LOGD("Package UiApp Category Info DB Insert Failed\n");
@@ -900,27 +864,25 @@ static int __insert_uiapplication_appcategory_info(manifest_x *mfx)
                        ct = ct->next;
                        memset(query, '\0', MAX_QUERY_LEN);
                }
-               up = up->next;
+               app = app->next;
        }
        return 0;
 }
 
-static int __insert_uiapplication_appmetadata_info(manifest_x *mfx)
+static int __insert_application_appmetadata_info(manifest_x *mfx)
 {
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        metadata_x *md = NULL;
        int ret = -1;
        char query[MAX_QUERY_LEN] = {'\0'};
-       while(up != NULL)
-       {
-               md = up->metadata;
-               while (md != NULL)
-               {
+       while (app != NULL) {
+               md = app->metadata;
+               while (md != NULL) {
                        if (md->key) {
                                snprintf(query, MAX_QUERY_LEN,
                                        "insert into package_app_app_metadata(app_id, md_key, md_value) " \
                                        "values('%s','%s', '%s')",\
-                                        up->appid, md->key, md->value ? md->value : "");
+                                        app->appid, md->key, md->value ? md->value : "");
                                ret = __exec_query(query);
                                if (ret == -1) {
                                        _LOGD("Package UiApp Metadata Info DB Insert Failed\n");
@@ -930,26 +892,24 @@ static int __insert_uiapplication_appmetadata_info(manifest_x *mfx)
                        md = md->next;
                        memset(query, '\0', MAX_QUERY_LEN);
                }
-               up = up->next;
+               app = app->next;
        }
        return 0;
 }
 
-static int __insert_uiapplication_apppermission_info(manifest_x *mfx)
+static int __insert_application_apppermission_info(manifest_x *mfx)
 {
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        permission_x *pm = NULL;
        int ret = -1;
        char query[MAX_QUERY_LEN] = {'\0'};
-       while(up != NULL)
-       {
-               pm = up->permission;
-               while (pm != NULL)
-               {
+       while (app != NULL) {
+               pm = app->permission;
+               while (pm != NULL) {
                        snprintf(query, MAX_QUERY_LEN,
                                "insert into package_app_app_permission(app_id, pm_type, pm_value) " \
                                "values('%s','%s', '%s')",\
-                                up->appid, pm->type, pm->value);
+                                app->appid, pm->type, pm->value);
                        ret = __exec_query(query);
                        if (ret == -1) {
                                _LOGD("Package UiApp permission Info DB Insert Failed\n");
@@ -958,20 +918,20 @@ static int __insert_uiapplication_apppermission_info(manifest_x *mfx)
                        pm = pm->next;
                        memset(query, '\0', MAX_QUERY_LEN);
                }
-               up = up->next;
+               app = app->next;
        }
        return 0;
 }
 
-static int __insert_uiapplication_appcontrol_info(manifest_x *mfx)
+static int __insert_application_appcontrol_info(manifest_x *mfx)
 {
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        appcontrol_x *acontrol = NULL;
        int ret = -1;
        char query[MAX_QUERY_LEN] = {'\0'};
        char buf[BUFSIZE] = {'\0'};
-       while (up != NULL) {
-               acontrol = up->appcontrol;
+       while (app != NULL) {
+               acontrol = app->appcontrol;
                while (acontrol != NULL) {
                        snprintf(buf, BUFSIZE, "%s|%s|%s",\
                                        acontrol->operation ? (strlen(acontrol->operation) > 0 ? acontrol->operation : "NULL") : "NULL",
@@ -980,7 +940,7 @@ static int __insert_uiapplication_appcontrol_info(manifest_x *mfx)
                        snprintf(query, MAX_QUERY_LEN,
                                        "insert into package_app_app_control(app_id, app_control) " \
                                        "values('%s', '%s')",\
-                                       up->appid, buf);
+                                       app->appid, buf);
                        ret = __exec_query(query);
                        if (ret == -1) {
                                _LOGD("Package UiApp AppSvc DB Insert Failed\n");
@@ -989,14 +949,15 @@ static int __insert_uiapplication_appcontrol_info(manifest_x *mfx)
                        memset(query, '\0', MAX_QUERY_LEN);
                        acontrol = acontrol->next;
                }
-               up = up->next;
+               app = app->next;
        }
        return 0;
 }
 
-static int __insert_uiapplication_appsvc_info(manifest_x *mfx)
+/* FIXME: should be changed to app_control */
+static int __insert_application_appsvc_info(manifest_x *mfx)
 {
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        appsvc_x *asvc = NULL;
        operation_x *op = NULL;
        mime_x *mi = NULL;
@@ -1008,9 +969,9 @@ static int __insert_uiapplication_appsvc_info(manifest_x *mfx)
        const char *mime = NULL;
        const char *uri = NULL;
        const char *subapp = NULL;
-       while(up != NULL)
+       while(app != NULL)
        {
-               asvc = up->appsvc;
+               asvc = app->appsvc;
                while(asvc != NULL)
                {
                        op = asvc->operation;
@@ -1037,7 +998,7 @@ static int __insert_uiapplication_appsvc_info(manifest_x *mfx)
                                                        snprintf(query, MAX_QUERY_LEN,
                                                                 "insert into package_app_app_svc(app_id, operation, uri_scheme, mime_type, subapp_name) " \
                                                                "values('%s', '%s', '%s', '%s', '%s')",\
-                                                                up->appid,
+                                                                app->appid,
                                                                 operation,
                                                                 __get_str(uri),
                                                                 __get_str(mime),
@@ -1067,27 +1028,25 @@ static int __insert_uiapplication_appsvc_info(manifest_x *mfx)
                        }
                        asvc = asvc->next;
                }
-               up = up->next;
+               app = app->next;
        }
        return 0;
 }
 
-static int __insert_uiapplication_datacontrol_info(manifest_x *mfx)
+static int __insert_application_datacontrol_info(manifest_x *mfx)
 {
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        datacontrol_x *dc = NULL;
        int ret = -1;
        char query[MAX_QUERY_LEN] = {'\0'};
 
-       while(up != NULL)
-       {
-               dc = up->datacontrol;
-               while(dc != NULL)
-               {
+       while (app != NULL) {
+               dc = app->datacontrol;
+               while (dc != NULL) {
                        snprintf(query, MAX_QUERY_LEN,
                                        "insert into package_app_data_control(app_id, providerid, access, type) " \
                                        "values('%s', '%s', '%s', '%s')",\
-                                       mfx->uiapplication->appid,
+                                       mfx->application->appid,
                                        dc->providerid,
                                        dc->access,
                                        dc->type);
@@ -1100,30 +1059,27 @@ static int __insert_uiapplication_datacontrol_info(manifest_x *mfx)
                        memset(query, '\0', MAX_QUERY_LEN);
                        dc = dc->next;
                }
-               up = up->next;
+               app = app->next;
        }
        return 0;
 }
 
-static int __insert_uiapplication_share_request_info(manifest_x *mfx)
+static int __insert_application_share_request_info(manifest_x *mfx)
 {
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        datashare_x *ds = NULL;
        request_x *rq = NULL;
        int ret = -1;
        char query[MAX_QUERY_LEN] = {'\0'};
-       while(up != NULL)
-       {
-               ds = up->datashare;
-               while(ds != NULL)
-               {
+       while (app != NULL) {
+               ds = app->datashare;
+               while (ds != NULL) {
                        rq = ds->request;
-                       while(rq != NULL)
-                       {
+                       while (rq != NULL) {
                                snprintf(query, MAX_QUERY_LEN,
                                         "insert into package_app_share_request(app_id, data_share_request) " \
                                        "values('%s', '%s')",\
-                                        up->appid, rq->text);
+                                        app->appid, rq->text);
                                ret = __exec_query(query);
                                if (ret == -1) {
                                        _LOGD("Package UiApp Share Request DB Insert Failed\n");
@@ -1134,34 +1090,30 @@ static int __insert_uiapplication_share_request_info(manifest_x *mfx)
                        }
                        ds = ds->next;
                }
-               up = up->next;
+               app = app->next;
        }
        return 0;
 }
 
-static int __insert_uiapplication_share_allowed_info(manifest_x *mfx)
+static int __insert_application_share_allowed_info(manifest_x *mfx)
 {
-       uiapplication_x *up = mfx->uiapplication;
+       application_x *app = mfx->application;
        datashare_x *ds = NULL;
        define_x *df = NULL;
        allowed_x *al = NULL;
        int ret = -1;
        char query[MAX_QUERY_LEN] = {'\0'};
-       while(up != NULL)
-       {
-               ds = up->datashare;
-               while(ds != NULL)
-               {
+       while (app != NULL) {
+               ds = app->datashare;
+               while (ds != NULL) {
                        df = ds->define;
-                       while(df != NULL)
-                       {
+                       while (df != NULL) {
                                al = df->allowed;
-                               while(al != NULL)
-                               {
+                               while (al != NULL) {
                                        snprintf(query, MAX_QUERY_LEN,
                                                 "insert into package_app_share_allowed(app_id, data_share_path, data_share_allowed) " \
                                                "values('%s', '%s', '%s')",\
-                                                up->appid, df->path, al->text);
+                                                app->appid, df->path, al->text);
                                        ret = __exec_query(query);
                                        if (ret == -1) {
                                                _LOGD("Package UiApp Share Allowed DB Insert Failed\n");
@@ -1174,333 +1126,7 @@ static int __insert_uiapplication_share_allowed_info(manifest_x *mfx)
                        }
                        ds = ds->next;
                }
-               up = up->next;
-       }
-       return 0;
-}
-
-static int __insert_serviceapplication_info(manifest_x *mfx)
-{
-       serviceapplication_x *sp = mfx->serviceapplication;
-       int ret = -1;
-       char query[MAX_QUERY_LEN] = {'\0'};
-       while(sp != NULL)
-       {
-               snprintf(query, MAX_QUERY_LEN,
-                        "insert into package_app_info(app_id, app_component, app_exec, app_type, app_onboot, " \
-                       "app_multiple, app_autorestart, app_enabled, app_permissiontype, package) " \
-                       "values('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",\
-                        sp->appid, "svcapp", sp->exec, sp->type, sp->onboot, "\0",
-                        sp->autorestart, sp->enabled, sp->permission_type, mfx->package);
-               ret = __exec_query(query);
-               if (ret == -1) {
-                       _LOGD("Package ServiceApp Info DB Insert Failed\n");
-                       return -1;
-               }
-               sp = sp->next;
-               memset(query, '\0', MAX_QUERY_LEN);
-       }
-       return 0;
-}
-
-static int __insert_serviceapplication_appcategory_info(manifest_x *mfx)
-{
-       serviceapplication_x *sp = mfx->serviceapplication;
-       category_x *ct = NULL;
-       int ret = -1;
-       char query[MAX_QUERY_LEN] = {'\0'};
-       while(sp != NULL)
-       {
-               ct = sp->category;
-               while (ct != NULL)
-               {
-                       snprintf(query, MAX_QUERY_LEN,
-                               "insert into package_app_app_category(app_id, category) " \
-                               "values('%s','%s')",\
-                                sp->appid, ct->name);
-                       ret = __exec_query(query);
-                       if (ret == -1) {
-                               _LOGD("Package ServiceApp Category Info DB Insert Failed\n");
-                               return -1;
-                       }
-                       ct = ct->next;
-                       memset(query, '\0', MAX_QUERY_LEN);
-               }
-               sp = sp->next;
-       }
-       return 0;
-}
-
-static int __insert_serviceapplication_appmetadata_info(manifest_x *mfx)
-{
-       serviceapplication_x *sp = mfx->serviceapplication;
-       metadata_x *md = NULL;
-       int ret = -1;
-       char query[MAX_QUERY_LEN] = {'\0'};
-       while(sp != NULL)
-       {
-               md = sp->metadata;
-               while (md != NULL)
-               {
-                       if (md->key) {
-                               snprintf(query, MAX_QUERY_LEN,
-                                       "insert into package_app_app_metadata(app_id, md_key, md_value) " \
-                                       "values('%s','%s', '%s')",\
-                                        sp->appid, md->key, md->value ? md->value : "");
-                               ret = __exec_query(query);
-                               if (ret == -1) {
-                                       _LOGD("Package ServiceApp Metadata Info DB Insert Failed\n");
-                                       return -1;
-                               }
-                       }
-                       md = md->next;
-                       memset(query, '\0', MAX_QUERY_LEN);
-               }
-               sp = sp->next;
-       }
-       return 0;
-}
-
-static int __insert_serviceapplication_apppermission_info(manifest_x *mfx)
-{
-       serviceapplication_x *sp = mfx->serviceapplication;
-       permission_x *pm = NULL;
-       int ret = -1;
-       char query[MAX_QUERY_LEN] = {'\0'};
-       while(sp != NULL)
-       {
-               pm = sp->permission;
-               while (pm != NULL)
-               {
-                       snprintf(query, MAX_QUERY_LEN,
-                               "insert into package_app_app_permission(app_id, pm_type, pm_value) " \
-                               "values('%s','%s', '%s')",\
-                                sp->appid, pm->type, pm->value);
-                       ret = __exec_query(query);
-                       if (ret == -1) {
-                               _LOGD("Package ServiceApp permission Info DB Insert Failed\n");
-                               return -1;
-                       }
-                       pm = pm->next;
-                       memset(query, '\0', MAX_QUERY_LEN);
-               }
-               sp = sp->next;
-       }
-       return 0;
-}
-
-static int __insert_serviceapplication_appcontrol_info(manifest_x *mfx)
-{
-       serviceapplication_x *sp = mfx->serviceapplication;
-       appcontrol_x *acontrol = NULL;
-       int ret = -1;
-       char query[MAX_QUERY_LEN] = {'\0'};
-       char buf[BUFSIZE] = {'\0'};
-       while (sp != NULL) {
-               acontrol = sp->appcontrol;
-               while (acontrol != NULL) {
-                       snprintf(buf, BUFSIZE, "%s|%s|%s",
-                                       acontrol->operation ? (strlen(acontrol->operation) > 0 ? acontrol->operation : "NULL") : "NULL",
-                                       acontrol->uri ? (strlen(acontrol->uri) > 0 ? acontrol->uri : "NULL") : "NULL",
-                                       acontrol->mime ? (strlen(acontrol->mime) > 0 ? acontrol->mime : "NULL") : "NULL");
-                       snprintf(query, MAX_QUERY_LEN,
-                                       "insert into package_app_app_control(app_id, app_control) " \
-                                       "values('%s', '%s')",\
-                                       sp->appid, buf);
-                       ret = __exec_query(query);
-                       if (ret == -1) {
-                               _LOGD("Package UiApp AppSvc DB Insert Failed\n");
-                               return -1;
-                       }
-                       memset(query, '\0', MAX_QUERY_LEN);
-                       acontrol = acontrol->next;
-               }
-               sp = sp->next;
-       }
-       return 0;
-}
-
-static int __insert_serviceapplication_appsvc_info(manifest_x *mfx)
-{
-       serviceapplication_x *sp = mfx->serviceapplication;
-       appsvc_x *asvc = NULL;
-       int ret = -1;
-       char query[MAX_QUERY_LEN] = {'\0'};
-       operation_x *op = NULL;
-       mime_x *mi = NULL;
-       uri_x *ui = NULL;
-       subapp_x *sub = NULL;
-       const char *operation = NULL;
-       const char *mime = NULL;
-       const char *uri = NULL;
-       const char *subapp = NULL;
-       while(sp != NULL)
-       {
-               asvc = sp->appsvc;
-               while(asvc != NULL)
-               {
-                       op = asvc->operation;
-                       while(op != NULL)
-                       {
-                       if (op)
-                               operation = op->name;
-                       mi = asvc->mime;
-                               do
-                               {
-                               if (mi)
-                                       mime = mi->name;
-                               sub = asvc->subapp;
-                                       do
-                                       {
-                                       if (sub)
-                                               subapp = sub->name;
-                                       ui = asvc->uri;
-                                                       do
-                                                       {
-                                                               if (ui)
-                                                                       uri = ui->name;
-                                                               snprintf(query, MAX_QUERY_LEN,
-                                                                        "insert into package_app_app_svc(app_id, operation, uri_scheme, mime_type, subapp_name) " \
-                                                                       "values('%s', '%s', '%s', '%s', '%s')",\
-                                                                        sp->appid,
-                                                                        operation,
-                                                                       __get_str(uri),
-                                                                       __get_str(mime),
-                                                                       __get_str(subapp));
-                                                               ret = __exec_query(query);
-                                                               if (ret == -1) {
-                                                                       _LOGD("Package UiApp AppSvc DB Insert Failed\n");
-                                                                       return -1;
-                                                               }
-                                                               memset(query, '\0', MAX_QUERY_LEN);
-                                                               if (ui)
-                                                                       ui = ui->next;
-                                                               uri = NULL;
-                                                       } while(ui != NULL);
-                                               if (sub)
-                                                       sub     = sub->next;
-                                               subapp = NULL;
-                                       }while(sub != NULL);
-                                       if (mi)
-                                               mi = mi->next;
-                                       mime = NULL;
-                               }while(mi != NULL);
-                               if (op)
-                                       op = op->next;
-                               operation = NULL;
-                       }
-                       asvc = asvc->next;
-               }
-               sp = sp->next;
-       }
-       return 0;
-}
-
-static int __insert_serviceapplication_datacontrol_info(manifest_x *mfx)
-{
-       serviceapplication_x *sp = mfx->serviceapplication;
-       datacontrol_x *dc = NULL;
-       int ret = -1;
-       char query[MAX_QUERY_LEN] = {'\0'};
-
-       while(sp != NULL)
-       {
-               dc = sp->datacontrol;
-               while(dc != NULL)
-               {
-                       snprintf(query, MAX_QUERY_LEN,
-                                       "insert into package_app_data_control(app_id, providerid, access, type) " \
-                                       "values('%s', '%s', '%s', '%s')",\
-                                       mfx->serviceapplication->appid,
-                                       dc->providerid,
-                                       dc->access,
-                                       dc->type);
-
-                       ret = __exec_query(query);
-                       if (ret == -1) {
-                               _LOGD("Package ServiceApp Data Control DB Insert Failed\n");
-                               return -1;
-                       }
-                       memset(query, '\0', MAX_QUERY_LEN);
-                       dc = dc->next;
-               }
-               sp = sp->next;
-       }
-       return 0;
-}
-
-static int __insert_serviceapplication_share_request_info(manifest_x *mfx)
-{
-       serviceapplication_x *sp = mfx->serviceapplication;
-       datashare_x *ds = NULL;
-       request_x *rq = NULL;
-       int ret = -1;
-       char query[MAX_QUERY_LEN] = {'\0'};
-       while(sp != NULL)
-       {
-               ds = sp->datashare;
-               while(ds != NULL)
-               {
-                       rq = ds->request;
-                       while(rq != NULL)
-                       {
-                               snprintf(query, MAX_QUERY_LEN,
-                                        "insert into package_app_share_request(app_id, data_share_request) " \
-                                       "values('%s', '%s')",\
-                                        sp->appid, rq->text);
-                               ret = __exec_query(query);
-                               if (ret == -1) {
-                                       _LOGD("Package ServiceApp Share Request DB Insert Failed\n");
-                                       return -1;
-                               }
-                               memset(query, '\0', MAX_QUERY_LEN);
-                               rq = rq->next;
-                       }
-                       ds = ds->next;
-               }
-               sp = sp->next;
-       }
-       return 0;
-}
-
-
-
-static int __insert_serviceapplication_share_allowed_info(manifest_x *mfx)
-{
-       serviceapplication_x *sp = mfx->serviceapplication;
-       datashare_x *ds = NULL;
-       define_x *df = NULL;
-       allowed_x *al = NULL;
-       int ret = -1;
-       char query[MAX_QUERY_LEN] = {'\0'};
-       while(sp != NULL)
-       {
-               ds = sp->datashare;
-               while(ds != NULL)
-               {
-                       df = ds->define;
-                       while(df != NULL)
-                       {
-                               al = df->allowed;
-                               while(al != NULL)
-                               {
-                                       snprintf(query, MAX_QUERY_LEN,
-                                                "insert into package_app_share_allowed(app_id, data_share_path, data_share_allowed) " \
-                                               "values('%s', '%s', '%s')",\
-                                                sp->appid, df->path, al->text);
-                                       ret = __exec_query(query);
-                                       if (ret == -1) {
-                                               _LOGD("Package App Share Allowed DB Insert Failed\n");
-                                               return -1;
-                                       }
-                                       memset(query, '\0', MAX_QUERY_LEN);
-                                       al = al->next;
-                               }
-                               df = df->next;
-                       }
-                       ds = ds->next;
-               }
-               sp = sp->next;
+               app = app->next;
        }
        return 0;
 }
@@ -1512,10 +1138,9 @@ static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid)
        icon_x *icn = mfx->icon;
        description_x *dcn = mfx->description;
        author_x *ath = mfx->author;
-       uiapplication_x *up = mfx->uiapplication;
-       uiapplication_x *up_icn = mfx->uiapplication;
-       uiapplication_x *up_image = mfx->uiapplication;
-       serviceapplication_x *sp = mfx->serviceapplication;
+       application_x *app = mfx->application;
+       application_x *app_icn = mfx->application;
+       application_x *app_image = mfx->application;
        privileges_x *pvs = NULL;
        privilege_x *pv = NULL;
        char query[MAX_QUERY_LEN] = { '\0' };
@@ -1609,8 +1234,8 @@ static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid)
                pvs = pvs->next;
        }
 
-       if (up != NULL) {
-               ret = __insert_ui_mainapp_info(mfx);
+       if (app != NULL) {
+               ret = __insert_mainapp_info(mfx);
                if (ret == -1)
                        return -1;
        }
@@ -1621,33 +1246,25 @@ static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid)
        __trimfunc(pkglocale);
 
        /*Insert the app locale info */
-       while(up != NULL)
-       {
-               applocale = __create_locale_list(applocale, up->label, NULL, up->icon, NULL, NULL);
-               up = up->next;
-       }
-       while(sp != NULL)
-       {
-               applocale = __create_locale_list(applocale, sp->label, NULL, sp->icon, NULL, NULL);
-               sp = sp->next;
+       while (app != NULL) {
+               applocale = __create_locale_list(applocale, app->label, NULL, app->icon, NULL, NULL);
+               app = app->next;
        }
        /*remove duplicated data in applocale*/
        __trimfunc(applocale);
 
        /*Insert the app icon info */
-       while(up_icn != NULL)
-       {
-               appicon = __create_icon_list(appicon, up_icn->icon);
-               up_icn = up_icn->next;
+       while (app_icn != NULL) {
+               appicon = __create_icon_list(appicon, app_icn->icon);
+               app_icn = app_icn->next;
        }
        /*remove duplicated data in appicon*/
        __trimfunc(appicon);
 
        /*Insert the image info */
-       while(up_image != NULL)
-       {
-               appimage = __create_image_list(appimage, up_image->image);
-               up_image = up_image->next;
+       while (app_image != NULL) {
+               appimage = __create_image_list(appimage, app_image->image);
+               app_image = app_image->next;
        }
        /*remove duplicated data in appimage*/
        __trimfunc(appimage);
@@ -1655,34 +1272,24 @@ static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid)
        g_list_foreach(pkglocale, __insert_pkglocale_info, (gpointer)mfx);
 
        /*native app locale info*/
-       up = mfx->uiapplication;
-       while(up != NULL)
-       {
-               g_list_foreach(applocale, __insert_uiapplication_locale_info, (gpointer)up);
-               up = up->next;
-       }
-       /*agent app locale info*/
-       sp = mfx->serviceapplication;
-       while(sp != NULL)
-       {
-               g_list_foreach(applocale, __insert_serviceapplication_locale_info, (gpointer)sp);
-               sp = sp->next;
+       app = mfx->application;
+       while (app != NULL) {
+               g_list_foreach(applocale, __insert_application_locale_info, (gpointer)app);
+               app = app->next;
        }
 
        /*app icon locale info*/
-       up_icn = mfx->uiapplication;
-       while(up_icn != NULL)
-       {
-               g_list_foreach(appicon, __insert_uiapplication_icon_section_info, (gpointer)up_icn);
-               up_icn = up_icn->next;
+       app_icn = mfx->application;
+       while (app_icn != NULL) {
+               g_list_foreach(appicon, __insert_application_icon_section_info, (gpointer)app_icn);
+               app_icn = app_icn->next;
        }
 
        /*app image info*/
-       up_image = mfx->uiapplication;
-       while(up_image != NULL)
-       {
-               g_list_foreach(appimage, __insert_uiapplication_image_info, (gpointer)up_image);
-               up_image = up_image->next;
+       app_image = mfx->application;
+       while (app_image != NULL) {
+               g_list_foreach(appimage, __insert_application_image_info, (gpointer)app_image);
+               app_image = app_image->next;
        }
 
        g_list_free(pkglocale);
@@ -1695,73 +1302,46 @@ static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid)
        appimage = NULL;
 
        /*Insert in the package_app_info DB*/
-       ret = __insert_uiapplication_info(mfx);
-       if (ret == -1)
-               return -1;
-       ret = __insert_serviceapplication_info(mfx);
+       ret = __insert_application_info(mfx);
        if (ret == -1)
                return -1;
        /*Insert in the package_app_app_control DB*/
-       ret = __insert_uiapplication_appcontrol_info(mfx);
-       if (ret == -1)
-               return -1;
-       ret = __insert_serviceapplication_appcontrol_info(mfx);
+       ret = __insert_application_appcontrol_info(mfx);
        if (ret == -1)
                return -1;
 
        /*Insert in the package_app_app_category DB*/
-       ret = __insert_uiapplication_appcategory_info(mfx);
-       if (ret == -1)
-               return -1;
-       ret = __insert_serviceapplication_appcategory_info(mfx);
+       ret = __insert_application_appcategory_info(mfx);
        if (ret == -1)
                return -1;
 
        /*Insert in the package_app_app_metadata DB*/
-       ret = __insert_uiapplication_appmetadata_info(mfx);
-       if (ret == -1)
-               return -1;
-       ret = __insert_serviceapplication_appmetadata_info(mfx);
+       ret = __insert_application_appmetadata_info(mfx);
        if (ret == -1)
                return -1;
 
        /*Insert in the package_app_app_permission DB*/
-       ret = __insert_uiapplication_apppermission_info(mfx);
-       if (ret == -1)
-               return -1;
-       ret = __insert_serviceapplication_apppermission_info(mfx);
+       ret = __insert_application_apppermission_info(mfx);
        if (ret == -1)
                return -1;
 
        /*Insert in the package_app_app_svc DB*/
-       ret = __insert_uiapplication_appsvc_info(mfx);
-       if (ret == -1)
-               return -1;
-       ret = __insert_serviceapplication_appsvc_info(mfx);
+       ret = __insert_application_appsvc_info(mfx);
        if (ret == -1)
                return -1;
 
        /*Insert in the package_app_share_allowed DB*/
-       ret = __insert_uiapplication_share_allowed_info(mfx);
-       if (ret == -1)
-               return -1;
-       ret = __insert_serviceapplication_share_allowed_info(mfx);
+       ret = __insert_application_share_allowed_info(mfx);
        if (ret == -1)
                return -1;
 
        /*Insert in the package_app_share_request DB*/
-       ret = __insert_uiapplication_share_request_info(mfx);
-       if (ret == -1)
-               return -1;
-       ret = __insert_serviceapplication_share_request_info(mfx);
+       ret = __insert_application_share_request_info(mfx);
        if (ret == -1)
                return -1;
 
        /*Insert in the package_app_data_control DB*/
-       ret = __insert_uiapplication_datacontrol_info(mfx);
-       if (ret == -1)
-               return -1;
-       ret = __insert_serviceapplication_datacontrol_info(mfx);
+       ret = __insert_application_datacontrol_info(mfx);
        if (ret == -1)
                return -1;
 
@@ -1850,8 +1430,7 @@ static int __delete_manifest_info_from_db(manifest_x *mfx, uid_t uid)
 {
        char query[MAX_QUERY_LEN] = { '\0' };
        int ret = -1;
-       uiapplication_x *up = mfx->uiapplication;
-       serviceapplication_x *sp = mfx->serviceapplication;
+       application_x *app = mfx->application;
        /*Delete from cert table*/
        if (uid != GLOBAL_USER)
                ret = pkgmgrinfo_delete_usr_certinfo(mfx->package, uid);
@@ -1890,84 +1469,44 @@ static int __delete_manifest_info_from_db(manifest_x *mfx, uid_t uid)
                return -1;
        }
 
-       while (up != NULL) {
-               ret = __delete_appinfo_from_db("package_app_info", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_localized_info", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_icon_section_info", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_image_info", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_app_svc", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_app_control", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_app_category", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_app_metadata", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_app_permission", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_share_allowed", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_share_request", up->appid);
-               if (ret < 0)
-                       return ret;
-               ret = __delete_appinfo_from_db("package_app_data_control", up->appid);
-               if (ret < 0)
-                       return ret;
-               up = up->next;
-       }
-
-       while (sp != NULL) {
-               ret = __delete_appinfo_from_db("package_app_info", sp->appid);
+       while (app != NULL) {
+               ret = __delete_appinfo_from_db("package_app_info", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_localized_info", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_localized_info", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_icon_section_info", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_icon_section_info", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_image_info", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_image_info", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_app_svc", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_app_svc", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_app_control", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_app_control", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_app_category", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_app_category", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_app_metadata", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_app_metadata", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_app_permission", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_app_permission", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_share_allowed", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_share_allowed", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_share_request", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_share_request", app->appid);
                if (ret < 0)
                        return ret;
-               ret = __delete_appinfo_from_db("package_app_data_control", sp->appid);
+               ret = __delete_appinfo_from_db("package_app_data_control", app->appid);
                if (ret < 0)
                        return ret;
-               sp = sp->next;
+               app = app->next;
        }
 
        /* if main package has sub pkg, delete sub pkg data*/
index 931f9cd..51a19ce 100644 (file)
@@ -1541,7 +1541,7 @@ API int pkgmgrinfo_appinfo_foreach_appcontrol(pkgmgrinfo_appinfo_h handle,
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
        appcontrol_x *appcontrol;
 
-       if (info->uiapp_info == NULL)
+       if (info->app_info == NULL)
                return PMINFO_R_ERROR;
 
        for (appcontrol = info->app_info->appcontrol; appcontrol; appcontrol = appcontrol->next) {
@@ -2049,7 +2049,7 @@ API int pkgmgrinfo_appinfo_is_guestmode_visibility(pkgmgrinfo_appinfo_h handle,
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL\n");
        retvm_if(status == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL\n");
 
-       val = info->uiapp_info->guestmode_visibility;
+       val = info->app_info->guestmode_visibility;
        *status = _get_bool_value(val);
        return PMINFO_R_OK;
 }
index c72cad2..045c606 100644 (file)
@@ -513,395 +513,6 @@ static void __ps_free_license(license_x *license)
        license = NULL;
 }
 
-static void __ps_free_uiapplication(uiapplication_x *uiapplication)
-{
-       if (uiapplication == NULL)
-               return;
-       if (uiapplication->exec) {
-               free((void *)uiapplication->exec);
-               uiapplication->exec = NULL;
-       }
-       if (uiapplication->appid) {
-               free((void *)uiapplication->appid);
-               uiapplication->appid = NULL;
-       }
-       if (uiapplication->nodisplay) {
-               free((void *)uiapplication->nodisplay);
-               uiapplication->nodisplay = NULL;
-       }
-       if (uiapplication->multiple) {
-               free((void *)uiapplication->multiple);
-               uiapplication->multiple = NULL;
-       }
-       if (uiapplication->type) {
-               free((void *)uiapplication->type);
-               uiapplication->type = NULL;
-       }
-       if (uiapplication->categories) {
-               free((void *)uiapplication->categories);
-               uiapplication->categories = NULL;
-       }
-       if (uiapplication->extraid) {
-               free((void *)uiapplication->extraid);
-               uiapplication->extraid = NULL;
-       }
-       if (uiapplication->taskmanage) {
-               free((void *)uiapplication->taskmanage);
-               uiapplication->taskmanage = NULL;
-       }
-       if (uiapplication->enabled) {
-               free((void *)uiapplication->enabled);
-               uiapplication->enabled = NULL;
-       }
-       if (uiapplication->hwacceleration) {
-               free((void *)uiapplication->hwacceleration);
-               uiapplication->hwacceleration = NULL;
-       }
-       if (uiapplication->screenreader) {
-               free((void *)uiapplication->screenreader);
-               uiapplication->screenreader = NULL;
-       }
-       if (uiapplication->mainapp) {
-               free((void *)uiapplication->mainapp);
-               uiapplication->mainapp = NULL;
-       }
-       if (uiapplication->recentimage) {
-               free((void *)uiapplication->recentimage);
-               uiapplication->recentimage = NULL;
-       }
-       if (uiapplication->package) {
-               free((void *)uiapplication->package);
-               uiapplication->package = NULL;
-       }
-       if (uiapplication->launchcondition) {
-               free((void *)uiapplication->launchcondition);
-               uiapplication->launchcondition = NULL;
-       }
-       /*Free Label*/
-       if (uiapplication->label) {
-               label_x *label = uiapplication->label;
-               label_x *tmp = NULL;
-               while(label != NULL) {
-                       tmp = label->next;
-                       __ps_free_label(label);
-                       label = tmp;
-               }
-       }
-       /*Free Icon*/
-       if (uiapplication->icon) {
-               icon_x *icon = uiapplication->icon;
-               icon_x *tmp = NULL;
-               while(icon != NULL) {
-                       tmp = icon->next;
-                       __ps_free_icon(icon);
-                       icon = tmp;
-               }
-       }
-       /*Free image*/
-       if (uiapplication->image) {
-               image_x *image = uiapplication->image;
-               image_x *tmp = NULL;
-               while(image != NULL) {
-                       tmp = image->next;
-                       __ps_free_image(image);
-                       image = tmp;
-               }
-       }
-       /*Free AppControl*/
-       if (uiapplication->appcontrol) {
-               appcontrol_x *appcontrol = uiapplication->appcontrol;
-               appcontrol_x *tmp = NULL;
-               while(appcontrol != NULL) {
-                       tmp = appcontrol->next;
-                       __ps_free_appcontrol(appcontrol);
-                       appcontrol = tmp;
-               }
-       }
-       /*Free LaunchConditions*/
-       if (uiapplication->launchconditions) {
-               launchconditions_x *launchconditions = uiapplication->launchconditions;
-               launchconditions_x *tmp = NULL;
-               while(launchconditions != NULL) {
-                       tmp = launchconditions->next;
-                       __ps_free_launchconditions(launchconditions);
-                       launchconditions = tmp;
-               }
-       }
-       /*Free Notification*/
-       if (uiapplication->notification) {
-               notification_x *notification = uiapplication->notification;
-               notification_x *tmp = NULL;
-               while(notification != NULL) {
-                       tmp = notification->next;
-                       __ps_free_notification(notification);
-                       notification = tmp;
-               }
-       }
-       /*Free DataShare*/
-       if (uiapplication->datashare) {
-               datashare_x *datashare = uiapplication->datashare;
-               datashare_x *tmp = NULL;
-               while(datashare != NULL) {
-                       tmp = datashare->next;
-                       __ps_free_datashare(datashare);
-                       datashare = tmp;
-               }
-       }
-       /*Free AppSvc*/
-       if (uiapplication->appsvc) {
-               appsvc_x *appsvc = uiapplication->appsvc;
-               appsvc_x *tmp = NULL;
-               while(appsvc != NULL) {
-                       tmp = appsvc->next;
-                       __ps_free_appsvc(appsvc);
-                       appsvc = tmp;
-               }
-       }
-       /*Free Category*/
-       if (uiapplication->category) {
-               category_x *category = uiapplication->category;
-               category_x *tmp = NULL;
-               while(category != NULL) {
-                       tmp = category->next;
-                       __ps_free_category(category);
-                       category = tmp;
-               }
-       }
-       /*Free Metadata*/
-       if (uiapplication->metadata) {
-               metadata_x *metadata = uiapplication->metadata;
-               metadata_x *tmp = NULL;
-               while(metadata != NULL) {
-                       tmp = metadata->next;
-                       __ps_free_metadata(metadata);
-                       metadata = tmp;
-               }
-       }
-       /*Free permission*/
-       if (uiapplication->permission) {
-               permission_x *permission = uiapplication->permission;
-               permission_x *tmp = NULL;
-               while(permission != NULL) {
-                       tmp = permission->next;
-                       __ps_free_permission(permission);
-                       permission = tmp;
-               }
-       }
-       /*Free DataControl*/
-       if (uiapplication->datacontrol) {
-               datacontrol_x *datacontrol = uiapplication->datacontrol;
-               datacontrol_x *tmp = NULL;
-               while(datacontrol != NULL) {
-                       tmp = datacontrol->next;
-                       __ps_free_datacontrol(datacontrol);
-                       datacontrol = tmp;
-               }
-       }
-       /* _PRODUCT_LAUNCHING_ENHANCED_ START */
-       if (uiapplication->indicatordisplay) {
-               free((void *)uiapplication->indicatordisplay);
-               uiapplication->indicatordisplay = NULL;
-       }
-       if (uiapplication->portraitimg) {
-               free((void *)uiapplication->portraitimg);
-               uiapplication->portraitimg = NULL;
-       }
-       if (uiapplication->landscapeimg) {
-               free((void *)uiapplication->landscapeimg);
-               uiapplication->landscapeimg = NULL;
-       }
-       /* _PRODUCT_LAUNCHING_ENHANCED_ END */
-       if (uiapplication->guestmode_visibility) {
-               free((void *)uiapplication->guestmode_visibility);
-               uiapplication->guestmode_visibility = NULL;
-       }
-       if (uiapplication->app_component) {
-               free((void *)uiapplication->app_component);
-               uiapplication->app_component = NULL;
-       }
-       if (uiapplication->permission_type) {
-               free((void *)uiapplication->permission_type);
-               uiapplication->permission_type = NULL;
-       }
-       if (uiapplication->component_type) {
-               free((void *)uiapplication->component_type);
-               uiapplication->component_type = NULL;
-       }
-       if (uiapplication->preload) {
-               free((void *)uiapplication->preload);
-               uiapplication->preload = NULL;
-       }
-       if (uiapplication->submode) {
-               free((void *)uiapplication->submode);
-               uiapplication->submode = NULL;
-       }
-       if (uiapplication->submode_mainid) {
-               free((void *)uiapplication->submode_mainid);
-               uiapplication->submode_mainid = NULL;
-       }
-       if (uiapplication->ui_gadget) {
-               free((void *)uiapplication->ui_gadget);
-               uiapplication->ui_gadget = NULL;
-       }
-       if (uiapplication->support_disable) {
-               free((void *)uiapplication->support_disable);
-               uiapplication->support_disable = NULL;
-       }
-
-       free((void*)uiapplication);
-       uiapplication = NULL;
-}
-
-static void __ps_free_serviceapplication(serviceapplication_x *serviceapplication)
-{
-       if (serviceapplication == NULL)
-               return;
-       if (serviceapplication->exec) {
-               free((void *)serviceapplication->exec);
-               serviceapplication->exec = NULL;
-       }
-       if (serviceapplication->appid) {
-               free((void *)serviceapplication->appid);
-               serviceapplication->appid = NULL;
-       }
-       if (serviceapplication->onboot) {
-               free((void *)serviceapplication->onboot);
-               serviceapplication->onboot = NULL;
-       }
-       if (serviceapplication->autorestart) {
-               free((void *)serviceapplication->autorestart);
-               serviceapplication->autorestart = NULL;
-       }
-       if (serviceapplication->type) {
-               free((void *)serviceapplication->type);
-               serviceapplication->type = NULL;
-       }
-       if (serviceapplication->enabled) {
-               free((void *)serviceapplication->enabled);
-               serviceapplication->enabled = NULL;
-       }
-       if (serviceapplication->package) {
-               free((void *)serviceapplication->package);
-               serviceapplication->package = NULL;
-       }
-       if (serviceapplication->permission_type) {
-               free((void *)serviceapplication->permission_type);
-               serviceapplication->permission_type = NULL;
-       }
-       /*Free Label*/
-       if (serviceapplication->label) {
-               label_x *label = serviceapplication->label;
-               label_x *tmp = NULL;
-               while(label != NULL) {
-                       tmp = label->next;
-                       __ps_free_label(label);
-                       label = tmp;
-               }
-       }
-       /*Free Icon*/
-       if (serviceapplication->icon) {
-               icon_x *icon = serviceapplication->icon;
-               icon_x *tmp = NULL;
-               while(icon != NULL) {
-                       tmp = icon->next;
-                       __ps_free_icon(icon);
-                       icon = tmp;
-               }
-       }
-       /*Free AppControl*/
-       if (serviceapplication->appcontrol) {
-               appcontrol_x *appcontrol = serviceapplication->appcontrol;
-               appcontrol_x *tmp = NULL;
-               while(appcontrol != NULL) {
-                       tmp = appcontrol->next;
-                       __ps_free_appcontrol(appcontrol);
-                       appcontrol = tmp;
-               }
-       }
-       /*Free DataControl*/
-       if (serviceapplication->datacontrol) {
-               datacontrol_x *datacontrol = serviceapplication->datacontrol;
-               datacontrol_x *tmp = NULL;
-               while(datacontrol != NULL) {
-                       tmp = datacontrol->next;
-                       __ps_free_datacontrol(datacontrol);
-                       datacontrol = tmp;
-               }
-       }
-       /*Free LaunchConditions*/
-       if (serviceapplication->launchconditions) {
-               launchconditions_x *launchconditions = serviceapplication->launchconditions;
-               launchconditions_x *tmp = NULL;
-               while(launchconditions != NULL) {
-                       tmp = launchconditions->next;
-                       __ps_free_launchconditions(launchconditions);
-                       launchconditions = tmp;
-               }
-       }
-       /*Free Notification*/
-       if (serviceapplication->notification) {
-               notification_x *notification = serviceapplication->notification;
-               notification_x *tmp = NULL;
-               while(notification != NULL) {
-                       tmp = notification->next;
-                       __ps_free_notification(notification);
-                       notification = tmp;
-               }
-       }
-       /*Free DataShare*/
-       if (serviceapplication->datashare) {
-               datashare_x *datashare = serviceapplication->datashare;
-               datashare_x *tmp = NULL;
-               while(datashare != NULL) {
-                       tmp = datashare->next;
-                       __ps_free_datashare(datashare);
-                       datashare = tmp;
-               }
-       }
-       /*Free AppSvc*/
-       if (serviceapplication->appsvc) {
-               appsvc_x *appsvc = serviceapplication->appsvc;
-               appsvc_x *tmp = NULL;
-               while(appsvc != NULL) {
-                       tmp = appsvc->next;
-                       __ps_free_appsvc(appsvc);
-                       appsvc = tmp;
-               }
-       }
-       /*Free Category*/
-       if (serviceapplication->category) {
-               category_x *category = serviceapplication->category;
-               category_x *tmp = NULL;
-               while(category != NULL) {
-                       tmp = category->next;
-                       __ps_free_category(category);
-                       category = tmp;
-               }
-       }
-       /*Free Metadata*/
-       if (serviceapplication->metadata) {
-               metadata_x *metadata = serviceapplication->metadata;
-               metadata_x *tmp = NULL;
-               while(metadata != NULL) {
-                       tmp = metadata->next;
-                       __ps_free_metadata(metadata);
-                       metadata = tmp;
-               }
-       }
-       /*Free permission*/
-       if (serviceapplication->permission) {
-               permission_x *permission = serviceapplication->permission;
-               permission_x *tmp = NULL;
-               while(permission != NULL) {
-                       tmp = permission->next;
-                       __ps_free_permission(permission);
-                       permission = tmp;
-               }
-       }
-       free((void*)serviceapplication);
-       serviceapplication = NULL;
-}
-
 static void __ps_free_font(font_x *font)
 {
        if (font == NULL)
@@ -966,7 +577,7 @@ static void __ps_free_ime(ime_x *ime)
        ime = NULL;
 }
 
-API void pkgmgrinfo_basic_free_application(application_x *application)
+static void __ps_free_application(application_x *application)
 {
        if (application == NULL)
                return;
@@ -991,6 +602,10 @@ API void pkgmgrinfo_basic_free_application(application_x *application)
                free((void *)application->taskmanage);
        if (application->enabled)
                free((void *)application->enabled);
+       if (application->categories)
+               free((void *)application->categories);
+       if (application->extraid)
+               free((void *)application->extraid);
        if (application->hwacceleration)
                free((void *)application->hwacceleration);
        if (application->screenreader)
@@ -1151,6 +766,11 @@ API void pkgmgrinfo_basic_free_application(application_x *application)
        free((void *)application);
 }
 
+API void pkgmgrinfo_basic_free_application(application_x *application)
+{
+       __ps_free_application(application);
+}
+
 API void pkgmgrinfo_basic_free_package(package_x *package)
 {
        if (package == NULL)
@@ -1308,24 +928,14 @@ API void pkgmgrinfo_basic_free_package(package_x *package)
                        privileges = tmp;
                }
        }
-       /*Free UiApplication*/
-       if (package->uiapplication) {
-               uiapplication_x *uiapplication = package->uiapplication;
-               uiapplication_x *tmp = NULL;
-               while(uiapplication != NULL) {
-                       tmp = uiapplication->next;
-                       __ps_free_uiapplication(uiapplication);
-                       uiapplication = tmp;
-               }
-       }
-       /*Free ServiceApplication*/
-       if (package->serviceapplication) {
-               serviceapplication_x *serviceapplication = package->serviceapplication;
-               serviceapplication_x *tmp = NULL;
-               while(serviceapplication != NULL) {
-                       tmp = serviceapplication->next;
-                       __ps_free_serviceapplication(serviceapplication);
-                       serviceapplication = tmp;
+       /*Free Application*/
+       if (package->application) {
+               application_x *application = package->application;
+               application_x *tmp = NULL;
+               while(application != NULL) {
+                       tmp = application->next;
+                       __ps_free_application(application);
+                       application = tmp;
                }
        }
        /*Free Daemon*/
index 902dd61..b1596a6 100644 (file)
@@ -536,7 +536,7 @@ API int pkgmgrinfo_appinfo_set_usr_guestmode_visibility(pkgmgrinfo_appinfo_h han
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL\n");
 
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
-       val = info->uiapp_info->guestmode_visibility;
+       val = info->app_info->guestmode_visibility;
        if (val) {
                ret = db_util_open_with_options(getUserPkgParserDBPathUID(uid), &pkgmgr_parser_db,
                                SQLITE_OPEN_READWRITE, NULL);
@@ -547,9 +547,9 @@ API int pkgmgrinfo_appinfo_set_usr_guestmode_visibility(pkgmgrinfo_appinfo_h han
 
                /*TODO: Write to DB here*/
                if (status == true)
-                       snprintf(query, MAX_QUERY_LEN, "update package_app_info set app_guestmodevisibility = 'true' where app_id = '%s'", (char *)info->uiapp_info->appid);
+                       snprintf(query, MAX_QUERY_LEN, "update package_app_info set app_guestmodevisibility = 'true' where app_id = '%s'", (char *)info->app_info->appid);
                else
-                       snprintf(query, MAX_QUERY_LEN, "update package_app_info set app_guestmodevisibility = 'false' where app_id = '%s'", (char *)info->uiapp_info->appid);
+                       snprintf(query, MAX_QUERY_LEN, "update package_app_info set app_guestmodevisibility = 'false' where app_id = '%s'", (char *)info->app_info->appid);
 
                ret = sqlite3_exec(pkgmgr_parser_db, query, NULL, NULL, &errmsg);
                sqlite3_close(pkgmgr_parser_db);