Fix a vulnerable query from sql injection
[platform/core/appfw/pkgmgr-info.git] / src / pkgmgrinfo_appinfo.c
index 28b4e09..1529a85 100644 (file)
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
 #include "pkgmgrinfo_private.h"
 #include "pkgmgr_parser.h"
 
-#define FILTER_QUERY_COUNT_APP "select count(DISTINCT package_app_info.app_id) " \
-                               "from package_app_info LEFT OUTER JOIN package_app_localized_info " \
-                               "ON package_app_info.app_id=package_app_localized_info.app_id " \
-                               "and package_app_localized_info.app_locale='%s' " \
-                               "LEFT OUTER JOIN package_app_app_svc " \
-                               "ON package_app_info.app_id=package_app_app_svc.app_id " \
-                               "LEFT OUTER JOIN package_app_app_category " \
-                               "ON package_app_info.app_id=package_app_app_category.app_id where "
-
 static bool _get_bool_value(const char *str)
 {
-       if (str == NULL)
-               return false;
-       else if (!strcasecmp(str, "true"))
+       if (str && !strcmp(str, "true"))
                return true;
        else
                return false;
@@ -36,10 +26,8 @@ static bool _get_bool_value(const char *str)
 static void __cleanup_appinfo(pkgmgr_appinfo_x *data)
 {
        pkgmgr_appinfo_x *info = data;
-       pkgmgr_appinfo_x *tmp;
 
-       while (info != NULL) {
-               tmp = info->next;
+       if (info != NULL) {
                if (info->package)
                        free((void *)info->package);
                if (info->locale)
@@ -47,207 +35,126 @@ static void __cleanup_appinfo(pkgmgr_appinfo_x *data)
 
                pkgmgrinfo_basic_free_application(info->app_info);
                free((void *)info);
-               info = tmp;
        }
        return;
 }
 
-static char *_get_filtered_query(const char *query_raw,
-               pkgmgrinfo_filter_x *filter)
-{
-       char buf[MAX_QUERY_LEN] = { 0, };
-       char *condition;
-       size_t len;
+static const char join_localized_info[] =
+       " LEFT OUTER JOIN package_app_localized_info"
+       "  ON ai.app_id=package_app_localized_info.app_id"
+       "  AND package_app_localized_info.app_locale=?";
+static const char join_category[] =
+       " LEFT OUTER JOIN package_app_app_category"
+       " ON ai.app_id=package_app_app_category.app_id";
+static const char join_app_control[] =
+       " LEFT OUTER JOIN package_app_app_control"
+       "  ON ai.app_id=package_app_app_control.app_id";
+static const char join_metadata[] =
+       " LEFT OUTER JOIN package_app_app_metadata"
+       "  ON ai.app_id=package_app_app_metadata.app_id ";
+static const char join_appinfo_for_uid[] =
+       " LEFT OUTER JOIN package_app_info_for_uid"
+       " ON ai.app_id=package_app_info_for_uid.app_id ";
+
+static int _get_filtered_query(pkgmgrinfo_filter_x *filter,
+       const char *locale, uid_t uid, char **query, GList **bind_params)
+{
+       int joined = 0;
+       size_t len = 0;
+       char *condition = NULL;
+       char buf[MAX_QUERY_LEN] = { '\0' };
+       char tmp_query[MAX_QUERY_LEN] = { '\0' };
+       static const char query_pkg_disable[] = " AND ai.package IN "
+                       "(SELECT package FROM package_info WHERE package_disable='false')";
        GSList *list;
-       GSList *head = NULL;
 
-       if (filter)
-               head = filter->list;
+       strncat(buf, " WHERE 1=1", MAX_QUERY_LEN - len - 1);
+       len += strlen(" WHERE 1=1");
 
-       strncat(buf, query_raw, MAX_QUERY_LEN - 1);
-       len = strlen(buf);
-       for (list = head; list; list = list->next) {
-               /* TODO: revise condition getter function */
-               __get_filter_condition(list->data, &condition);
+       if (filter == NULL) {
+               strncat(buf, query_pkg_disable, MAX_QUERY_LEN - len - 1);
+               *query = strdup(buf);
+               return PMINFO_R_OK;
+       }
+
+       for (list = filter->list; list; list = list->next) {
+               joined |= __get_filter_condition(list->data, uid, &condition, bind_params);
                if (condition == NULL)
                        continue;
-               if (buf[strlen(query_raw)] == '\0') {
-                       len += strlen(" WHERE ");
-                       strncat(buf, " WHERE ", MAX_QUERY_LEN - len - 1);
-               } else {
-                       len += strlen(" AND ");
-                       strncat(buf, " AND ", MAX_QUERY_LEN -len - 1);
-               }
-               len += strlen(condition);
+
+               strncat(buf, " AND ", MAX_QUERY_LEN - len - 1);
+               len += strlen(" AND ");
+
                strncat(buf, condition, sizeof(buf) - len - 1);
+               len += strlen(condition);
                free(condition);
                condition = NULL;
        }
 
-       return strdup(buf);
-}
-
-static GSList *_appinfo_get_filtered_list(const char *locale,
-               pkgmgrinfo_filter_x *filter)
-{
-       static const char query_raw[] =
-               "SELECT DISTINCT package_app_info.app_id FROM package_app_info"
-               " LEFT OUTER JOIN package_app_localized_info"
-               "  ON package_app_info.app_id=package_app_localized_info.app_id"
-               "  AND package_app_localized_info.app_locale=%Q"
-               " LEFT OUTER JOIN package_app_app_category"
-               "  ON package_app_info.app_id=package_app_app_category.app_id"
-               " LEFT OUTER JOIN package_app_app_svc"
-               "  ON package_app_info.app_id=package_app_app_svc.app_id ";
-       int ret;
-       char *query;
-       char *query_localized;
-       sqlite3_stmt *stmt;
-       GSList *list = NULL;
-       char *appid;
-
-       query = _get_filtered_query(query_raw, filter);
-       if (query == NULL)
-               return NULL;
-       query_localized = sqlite3_mprintf(query, locale);
-       free(query);
-       if (query_localized == NULL)
-               return NULL;
-
-       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query_localized,
-                       strlen(query_localized), &stmt, NULL);
-       sqlite3_free(query_localized);
-       if (ret != SQLITE_OK) {
-               LOGE("prepare failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
-               return NULL;
-       }
-
-       while (sqlite3_step(stmt) == SQLITE_ROW) {
-               _save_column_str(stmt, 0, (const char **)&appid);
-               list = g_slist_append(list, appid);
+       if (filter->list_metadata) {
+               strncat(buf, " AND (", MAX_QUERY_LEN - len - 1);
+               len += strlen(" AND (");
        }
+       for (list = filter->list_metadata; list; list = list->next) {
+               joined |= __get_metadata_filter_condition(list->data,
+                               &condition, bind_params);
+               if (condition == NULL)
+                       continue;
+               strncat(buf, condition, sizeof(buf) - len - 1);
+               len += strlen(condition);
+               free(condition);
+               condition = NULL;
 
-       sqlite3_finalize(stmt);
-
-       return list;
-}
-
-static int _appinfo_get_label(const char *appid, const char *locale,
-               label_x **label)
-{
-       static const char query_raw[] =
-               "SELECT app_label, app_locale "
-               "FROM package_app_localized_info "
-               "WHERE app_id=%Q AND app_locale IN (%Q, %Q)";
-       int ret;
-       char *query;
-       sqlite3_stmt *stmt;
-       int idx;
-       label_x *info;
-
-       query = sqlite3_mprintf(query_raw, appid, locale, DEFAULT_LOCALE);
-       if (query == NULL) {
-               LOGE("out of memory");
-               return PMINFO_R_ERROR;
+               strncat(buf, " OR ", MAX_QUERY_LEN - len - 1);
+               len += strlen(" OR ");
        }
-
-       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query),
-                       &stmt, NULL);
-       sqlite3_free(query);
-       if (ret != SQLITE_OK) {
-               LOGE("prepare failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
-               return PMINFO_R_ERROR;
+       if (filter->list_metadata) {
+               strncat(buf, "1=0)", MAX_QUERY_LEN - len - 1);
+               len += strlen("1=0)");
        }
 
-       while (sqlite3_step(stmt) == SQLITE_ROW) {
-               info = calloc(1, sizeof(label_x));
-               if (info == NULL) {
-                       LOGE("out of memory");
-                       sqlite3_finalize(stmt);
-                       if (*label) {
-                               LISTHEAD(*label, info);
-                               *label = info;
-                       }
-                       return PMINFO_R_ERROR;
-               }
-               idx = 0;
-               _save_column_str(stmt, idx++, &info->text);
-               _save_column_str(stmt, idx++, &info->lang);
-               LISTADD(*label, info);
+       if (joined & E_PMINFO_APPINFO_JOIN_LOCALIZED_INFO) {
+               strncat(tmp_query, join_localized_info, MAX_QUERY_LEN - len - 1);
+               len += strlen(join_localized_info);
+               *bind_params = g_list_append(*bind_params, strdup(locale));
        }
-
-       if (*label) {
-               LISTHEAD(*label, info);
-               *label = info;
+       if (joined & E_PMINFO_APPINFO_JOIN_CATEGORY) {
+               strncat(tmp_query, join_category, MAX_QUERY_LEN - len - 1);
+               len += strlen(join_category);
        }
-
-       sqlite3_finalize(stmt);
-
-       return PMINFO_R_OK;
-}
-
-static int _appinfo_get_icon(const char *appid, const char *locale,
-               icon_x **icon)
-{
-       static const char query_raw[] =
-               "SELECT app_icon, app_locale "
-               "FROM package_app_localized_info "
-               "WHERE app_id=%Q AND app_locale IN (%Q, %Q)";
-       int ret;
-       char *query;
-       sqlite3_stmt *stmt;
-       int idx;
-       icon_x *info;
-
-       query = sqlite3_mprintf(query_raw, appid, locale, DEFAULT_LOCALE);
-       if (query == NULL) {
-               LOGE("out of memory");
-               return PMINFO_R_ERROR;
+       if (joined & E_PMINFO_APPINFO_JOIN_APP_CONTROL) {
+               strncat(tmp_query, join_app_control, MAX_QUERY_LEN - len - 1);
+               len += strlen(join_app_control);
        }
-
-       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query),
-                       &stmt, NULL);
-       sqlite3_free(query);
-       if (ret != SQLITE_OK) {
-               LOGE("prepare failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
-               return PMINFO_R_ERROR;
+       if (joined & E_PMINFO_APPINFO_JOIN_METADATA) {
+               strncat(tmp_query, join_metadata, MAX_QUERY_LEN - len - 1);
+               len += strlen(join_metadata);
        }
-
-       while (sqlite3_step(stmt) == SQLITE_ROW) {
-               info = calloc(1, sizeof(icon_x));
-               if (info == NULL) {
-                       LOGE("out of memory");
-                       sqlite3_finalize(stmt);
-                       if (*icon) {
-                               LISTHEAD(*icon, info);
-                               *icon = info;
-                       }
-                       return PMINFO_R_ERROR;
-               }
-               idx = 0;
-               _save_column_str(stmt, idx++, &info->text);
-               _save_column_str(stmt, idx++, &info->lang);
-               LISTADD(*icon, info);
+       if (joined & E_PMINFO_APPINFO_JOIN_APPINFO_FOR_UID) {
+               strncat(tmp_query, join_appinfo_for_uid, MAX_QUERY_LEN - len - 1);
+               len += strlen(join_appinfo_for_uid);
        }
+       strncat(tmp_query, buf, MAX_QUERY_LEN - len - 1);
+       len += strlen(buf);
 
-       if (*icon) {
-               LISTHEAD(*icon, info);
-               *icon = info;
-       }
+       strncat(tmp_query, query_pkg_disable, MAX_QUERY_LEN - len - 1);
 
-       sqlite3_finalize(stmt);
+       *query = strdup(tmp_query);
+       if (*query == NULL)
+               return PMINFO_R_ERROR;
 
        return PMINFO_R_OK;
 }
 
-static int _appinfo_get_category(const char *appid, category_x **category)
+static int _appinfo_get_category(sqlite3 *db, const char *appid,
+               GList **category)
 {
        static const char query_raw[] =
                "SELECT category FROM package_app_app_category WHERE app_id=%Q";
        int ret;
        char *query;
        sqlite3_stmt *stmt;
-       category_x *info;
+       char *val;
 
        query = sqlite3_mprintf(query_raw, appid);
        if (query == NULL) {
@@ -255,32 +162,18 @@ static int _appinfo_get_category(const char *appid, category_x **category)
                return PMINFO_R_ERROR;
        }
 
-       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query),
-                       &stmt, NULL);
+       ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL);
        sqlite3_free(query);
        if (ret != SQLITE_OK) {
-               LOGE("prepare failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
+               LOGE("prepare failed: %s", sqlite3_errmsg(db));
                return PMINFO_R_ERROR;
        }
 
        while (sqlite3_step(stmt) == SQLITE_ROW) {
-               info = calloc(1, sizeof(category_x));
-               if (info == NULL) {
-                       LOGE("out of memory");
-                       sqlite3_finalize(stmt);
-                       if (*category) {
-                               LISTHEAD(*category, info);
-                               *category = info;
-                       }
-                       return PMINFO_R_ERROR;
-               }
-               _save_column_str(stmt, 0, &info->name);
-               LISTADD(*category, info);
-       }
-
-       if (*category) {
-               LISTHEAD(*category, info);
-               *category = info;
+               val = NULL;
+               _save_column_str(stmt, 0, &val);
+               if (val)
+                       *category = g_list_append(*category, (gpointer)val);
        }
 
        sqlite3_finalize(stmt);
@@ -288,7 +181,7 @@ static int _appinfo_get_category(const char *appid, category_x **category)
        return PMINFO_R_OK;
 }
 
-static void __parse_appcontrol(appcontrol_x **appcontrol, char *appcontrol_str)
+static void __parse_appcontrol(GList **appcontrol, char *appcontrol_str)
 {
        char *dup;
        char *token;
@@ -314,18 +207,14 @@ static void __parse_appcontrol(appcontrol_x **appcontrol, char *appcontrol_str)
                token = strtok_r(NULL, "|", &ptr);
                if (token && strcmp(token, "NULL"))
                        ac->mime = strdup(token);
-               LISTADD(*appcontrol, ac);
+               *appcontrol = g_list_append(*appcontrol, ac);
        } while ((token = strtok_r(NULL, ";", &ptr)));
 
-       if (*appcontrol) {
-               LISTHEAD(*appcontrol, ac);
-               *appcontrol = ac;
-       }
        free(dup);
 }
 
-static int _appinfo_get_app_control(const char *appid,
-               appcontrol_x **appcontrol)
+static int _appinfo_get_app_control(sqlite3 *db, const char *appid,
+               GList **appcontrol)
 {
        static const char query_raw[] =
                "SELECT app_control FROM package_app_app_control "
@@ -333,7 +222,6 @@ static int _appinfo_get_app_control(const char *appid,
        int ret;
        char *query;
        sqlite3_stmt *stmt;
-       appcontrol_x *info = NULL;
        char *str;
 
        query = sqlite3_mprintf(query_raw, appid);
@@ -342,34 +230,31 @@ static int _appinfo_get_app_control(const char *appid,
                return PMINFO_R_ERROR;
        }
 
-       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query),
-                       &stmt, NULL);
+       ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL);
        sqlite3_free(query);
        if (ret != SQLITE_OK) {
-               LOGE("prepare failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
+               LOGE("prepare failed: %s", sqlite3_errmsg(db));
                return PMINFO_R_ERROR;
        }
 
        while (sqlite3_step(stmt) == SQLITE_ROW) {
                str = NULL;
-               _save_column_str(stmt, 0, (const char **)&str);
+               _save_column_str(stmt, 0, &str);
                /* TODO: revise */
-               __parse_appcontrol(&info, str);
+               __parse_appcontrol(appcontrol, str);
                free(str);
        }
 
-       *appcontrol = info;
-
        sqlite3_finalize(stmt);
 
        return PMINFO_R_OK;
 }
 
-static int _appinfo_get_data_control(const char *appid,
-               datacontrol_x **datacontrol)
+static int _appinfo_get_data_control(sqlite3 *db, const char *appid,
+               GList **datacontrol)
 {
        static const char query_raw[] =
-               "SELECT providerid, access, type "
+               "SELECT providerid, access, type, trusted "
                "FROM package_app_data_control WHERE app_id=%Q";
        int ret;
        char *query;
@@ -383,11 +268,10 @@ static int _appinfo_get_data_control(const char *appid,
                return PMINFO_R_ERROR;
        }
 
-       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query),
-                       &stmt, NULL);
+       ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL);
        sqlite3_free(query);
        if (ret != SQLITE_OK) {
-               LOGE("prepare failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
+               LOGE("prepare failed: %s", sqlite3_errmsg(db));
                return PMINFO_R_ERROR;
        }
 
@@ -396,22 +280,14 @@ static int _appinfo_get_data_control(const char *appid,
                if (info == NULL) {
                        LOGE("out of memory");
                        sqlite3_finalize(stmt);
-                       if (*datacontrol) {
-                               LISTHEAD(*datacontrol, info);
-                               *datacontrol = info;
-                       }
                        return PMINFO_R_ERROR;
                }
                idx = 0;
                _save_column_str(stmt, idx++, &info->providerid);
                _save_column_str(stmt, idx++, &info->access);
                _save_column_str(stmt, idx++, &info->type);
-               LISTADD(*datacontrol, info);
-       }
-
-       if (*datacontrol) {
-               LISTHEAD(*datacontrol, info);
-               *datacontrol = info;
+               _save_column_str(stmt, idx++, &info->trusted);
+               *datacontrol = g_list_append(*datacontrol, info);
        }
 
        sqlite3_finalize(stmt);
@@ -419,7 +295,8 @@ static int _appinfo_get_data_control(const char *appid,
        return PMINFO_R_OK;
 }
 
-static int _appinfo_get_metadata(const char *appid, metadata_x **metadata)
+static int _appinfo_get_metadata(sqlite3 *db, const char *appid,
+               GList **metadata)
 {
        static const char query_raw[] =
                "SELECT md_key, md_value "
@@ -436,11 +313,10 @@ static int _appinfo_get_metadata(const char *appid, metadata_x **metadata)
                return PMINFO_R_ERROR;
        }
 
-       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query),
-                       &stmt, NULL);
+       ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL);
        sqlite3_free(query);
        if (ret != SQLITE_OK) {
-               LOGE("prepare failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
+               LOGE("prepare failed: %s", sqlite3_errmsg(db));
                return PMINFO_R_ERROR;
        }
 
@@ -449,21 +325,12 @@ static int _appinfo_get_metadata(const char *appid, metadata_x **metadata)
                if (info == NULL) {
                        LOGE("out of memory");
                        sqlite3_finalize(stmt);
-                       if (*metadata) {
-                               LISTHEAD(*metadata, info);
-                               *metadata = info;
-                       }
                        return PMINFO_R_ERROR;
                }
                idx = 0;
                _save_column_str(stmt, idx++, &info->key);
                _save_column_str(stmt, idx++, &info->value);
-               LISTADD(*metadata, info);
-       }
-
-       if (*metadata) {
-               LISTHEAD(*metadata, info);
-               *metadata = info;
+               *metadata = g_list_append(*metadata, info);
        }
 
        sqlite3_finalize(stmt);
@@ -472,26 +339,17 @@ static int _appinfo_get_metadata(const char *appid, metadata_x **metadata)
 
 }
 
-static int _appinfo_get_app(const char *appid, const char *locale,
-               pkgmgr_appinfo_x **appinfo)
+static int _appinfo_get_splashscreens(sqlite3 *db, const char *appid,
+               GList **splashscreens)
 {
        static const char query_raw[] =
-               "SELECT 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, "
-               "component_type, package "
-               "FROM package_app_info WHERE app_id=%Q";
+               "SELECT src, type, orientation, indicatordisplay, operation, color_depth "
+               "FROM package_app_splash_screen WHERE app_id=%Q";
        int ret;
        char *query;
        sqlite3_stmt *stmt;
        int idx;
-       pkgmgr_appinfo_x *info;
-       application_x *app;
+       splashscreen_x *info;
 
        query = sqlite3_mprintf(query_raw, appid);
        if (query == NULL) {
@@ -499,241 +357,1058 @@ static int _appinfo_get_app(const char *appid, const char *locale,
                return PMINFO_R_ERROR;
        }
 
-       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query),
-                       &stmt, NULL);
+       ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL);
        sqlite3_free(query);
        if (ret != SQLITE_OK) {
-               LOGE("prepare failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
+               LOGE("prepare failed: %s", sqlite3_errmsg(db));
                return PMINFO_R_ERROR;
        }
 
-       ret = sqlite3_step(stmt);
-       if (ret == SQLITE_DONE) {
-               LOGE("cannot find app");
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ENOENT;
-       } else if (ret != SQLITE_ROW) {
-               LOGE("step failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ERROR;
+       while (sqlite3_step(stmt) == SQLITE_ROW) {
+               info = calloc(1, sizeof(splashscreen_x));
+               if (info == NULL) {
+                       LOGE("out of memory");
+                       sqlite3_finalize(stmt);
+                       return PMINFO_R_ERROR;
+               }
+               idx = 0;
+               _save_column_str(stmt, idx++, &info->src);
+               _save_column_str(stmt, idx++, &info->type);
+               _save_column_str(stmt, idx++, &info->orientation);
+               _save_column_str(stmt, idx++, &info->indicatordisplay);
+               _save_column_str(stmt, idx++, &info->operation);
+               _save_column_str(stmt, idx++, &info->color_depth);
+               *splashscreens = g_list_append(*splashscreens, info);
        }
 
-       app = calloc(1, sizeof(application_x));
-       if (app == NULL) {
-               LOGE("out of memory");
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ERROR;
-       }
-       idx = 0;
-       _save_column_str(stmt, idx++, &app->appid);
-       _save_column_str(stmt, idx++, &app->component);
-       _save_column_str(stmt, idx++, &app->exec);
-       _save_column_str(stmt, idx++, &app->nodisplay);
-       _save_column_str(stmt, idx++, &app->type);
-       _save_column_str(stmt, idx++, &app->onboot);
-       _save_column_str(stmt, idx++, &app->multiple);
-       _save_column_str(stmt, idx++, &app->autorestart);
-       _save_column_str(stmt, idx++, &app->taskmanage);
-       _save_column_str(stmt, idx++, &app->enabled);
-       _save_column_str(stmt, idx++, &app->hwacceleration);
-       _save_column_str(stmt, idx++, &app->screenreader);
-       _save_column_str(stmt, idx++, &app->mainapp);
-       _save_column_str(stmt, idx++, &app->recentimage);
-       _save_column_str(stmt, idx++, &app->launchcondition);
-       _save_column_str(stmt, idx++, &app->indicatordisplay);
-       _save_column_str(stmt, idx++, &app->portraitimg);
-       _save_column_str(stmt, idx++, &app->landscapeimg);
-       _save_column_str(stmt, idx++, &app->guestmode_visibility);
-       _save_column_str(stmt, idx++, &app->permission_type);
-       _save_column_str(stmt, idx++, &app->preload);
-       _save_column_str(stmt, idx++, &app->submode);
-       _save_column_str(stmt, idx++, &app->submode_mainid);
-       _save_column_str(stmt, idx++, &app->launch_mode);
-       _save_column_str(stmt, idx++, &app->ui_gadget);
-       _save_column_str(stmt, idx++, &app->component_type);
-       _save_column_str(stmt, idx++, &app->package);
+       sqlite3_finalize(stmt);
 
-       if (_appinfo_get_label(app->appid, locale, &app->label)) {
-               pkgmgrinfo_basic_free_application(app);
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ERROR;
-       }
+       return PMINFO_R_OK;
+}
 
-       if (_appinfo_get_icon(app->appid, locale, &app->icon)) {
-               pkgmgrinfo_basic_free_application(app);
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ERROR;
-       }
+static GList *__get_background_category(const char *value)
+{
+       GList *category_list = NULL;
+       int convert_value = 0;
+       if (!value || strlen(value) == 0)
+               return NULL;
 
-       if (_appinfo_get_category(app->appid, &app->category)) {
-               pkgmgrinfo_basic_free_application(app);
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ERROR;
-       }
+       convert_value = atoi(value);
+       if (convert_value < 0)
+               return NULL;
 
-       if (_appinfo_get_app_control(app->appid, &app->appcontrol)) {
-               pkgmgrinfo_basic_free_application(app);
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ERROR;
-       }
+       if (convert_value & APP_BG_CATEGORY_USER_DISABLE_TRUE_VAL)
+               category_list = g_list_append(category_list, strdup(APP_BG_CATEGORY_USER_DISABLE_TRUE_STR));
+       else
+               category_list = g_list_append(category_list, strdup(APP_BG_CATEGORY_USER_DISABLE_FALSE_STR));
 
-       if (_appinfo_get_data_control(app->appid, &app->datacontrol)) {
-               pkgmgrinfo_basic_free_application(app);
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ERROR;
-       }
+       if (convert_value & APP_BG_CATEGORY_MEDIA_VAL)
+               category_list = g_list_append(category_list, strdup(APP_BG_CATEGORY_MEDIA_STR));
 
-       if (_appinfo_get_metadata(app->appid, &app->metadata)) {
-               pkgmgrinfo_basic_free_application(app);
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ERROR;
-       }
+       if (convert_value & APP_BG_CATEGORY_DOWNLOAD_VAL)
+               category_list = g_list_append(category_list, strdup(APP_BG_CATEGORY_DOWNLOAD_STR));
 
-       info = calloc(1, sizeof(pkgmgr_appinfo_x));
-       if (info == NULL) {
-               LOGE("out of memory");
-               pkgmgrinfo_basic_free_application(app);
-               sqlite3_finalize(stmt);
-               return PMINFO_R_ERROR;
-       }
+       if (convert_value & APP_BG_CATEGORY_BGNETWORK_VAL)
+               category_list = g_list_append(category_list, strdup(APP_BG_CATEGORY_BGNETWORK_STR));
 
-       info->package = strdup(app->package);
-       info->app_info = app;
-       info->locale = strdup(locale);
-       *appinfo = info;
+       if (convert_value & APP_BG_CATEGORY_LOCATION_VAL)
+               category_list = g_list_append(category_list, strdup(APP_BG_CATEGORY_LOCATION_STR));
 
-       sqlite3_finalize(stmt);
+       if (convert_value & APP_BG_CATEGORY_SENSOR_VAL)
+               category_list = g_list_append(category_list, strdup(APP_BG_CATEGORY_SENSOR_STR));
 
-       return PMINFO_R_OK;
-}
+       if (convert_value & APP_BG_CATEGORY_IOTCOMM_VAL)
+               category_list = g_list_append(category_list, strdup(APP_BG_CATEGORY_IOTCOMM_STR));
 
-API int pkgmgrinfo_appinfo_get_usr_appinfo(const char *appid, uid_t uid,
-               pkgmgrinfo_appinfo_h *handle)
-{
-       pkgmgr_appinfo_x *appinfo = NULL;
-       char *locale;
+       if (convert_value & APP_BG_CATEGORY_SYSTEM_VAL)
+               category_list = g_list_append(category_list, strdup(APP_BG_CATEGORY_SYSTEM));
 
-       if (appid == NULL || handle == NULL) {
-               LOGE("invalid parameter");
-               return PMINFO_R_EINVAL;
-       }
+       return category_list;
 
-       if (__open_manifest_db(uid) < 0)
-               return PMINFO_R_ERROR;
+}
 
-       locale = _get_system_locale();
-       if (locale == NULL) {
-               __close_manifest_db();
+static int __get_appinfo_for_uid(sqlite3 *db, application_x *info, uid_t uid)
+{
+       static const char query_raw[] =
+               "SELECT is_splash_screen_enabled, is_disabled "
+               "FROM package_app_info_for_uid WHERE app_id=%Q AND uid=%d";
+       int ret;
+       char *query;
+       char *is_disabled = NULL;
+       sqlite3_stmt *stmt;
+
+       query = sqlite3_mprintf(query_raw, info->appid, uid);
+       if (query == NULL) {
+               LOGE("out of memory");
                return PMINFO_R_ERROR;
        }
 
-       if (_appinfo_get_app(appid, locale, &appinfo)) {
-               free(locale);
-               __close_manifest_db();
+       ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL);
+       sqlite3_free(query);
+       if (ret != SQLITE_OK) {
+               LOGE("sqlite3_prepare_v2() failed: %s", sqlite3_errmsg(db));
                return PMINFO_R_ERROR;
        }
 
-       *handle = appinfo;
-
-       free(locale);
-       __close_manifest_db();
+       while (sqlite3_step(stmt) == SQLITE_ROW) {
+               if (info->splash_screen_display)
+                       free(info->splash_screen_display);
+               _save_column_str(stmt, 0, &info->splash_screen_display);
+               if (strcasecmp(info->is_disabled, "false") == 0) {
+                       _save_column_str(stmt, 1, &is_disabled);
+                       if (strcasecmp(is_disabled, "true") == 0) {
+                               free(info->is_disabled);
+                               info->is_disabled = is_disabled;
+                       } else {
+                               free(is_disabled);
+                       }
+               }
+       }
 
+       sqlite3_finalize(stmt);
        return PMINFO_R_OK;
 }
 
-API int pkgmgrinfo_appinfo_get_appinfo(const char *appid, pkgmgrinfo_appinfo_h *handle)
+static void __free_applications(gpointer data)
 {
-       return pkgmgrinfo_appinfo_get_usr_appinfo(appid, GLOBAL_USER, handle);
+       pkgmgrinfo_basic_free_application((application_x *)data);
 }
 
-static int _appinfo_get_filtered_foreach_appinfo(uid_t uid,
-               pkgmgrinfo_filter_x *filter, pkgmgrinfo_app_list_cb app_list_cb,
-               void *user_data)
+static gint __app_disable_chk_func(gconstpointer data1, gconstpointer data2)
 {
-       pkgmgr_appinfo_x *info;
-       GSList *list;
-       GSList *tmp;
-       char *appid;
-       char *locale;
-       int stop = 0;
-
-       if (__open_manifest_db(uid) < 0)
-               return PMINFO_R_ERROR;
+       pkgmgrinfo_node_x *node = (pkgmgrinfo_node_x *)data1;
 
-       locale = _get_system_locale();
-       if (locale == NULL) {
-               __close_manifest_db();
-               return PMINFO_R_ERROR;
-       }
+       if (node->prop == E_PMINFO_APPINFO_PROP_APP_DISABLE)
+               return 0;
+       else
+               return 1;
+}
 
-       list = _appinfo_get_filtered_list(locale, filter);
-       if (list == NULL) {
-               free(locale);
-               __close_manifest_db();
-               return PMINFO_R_OK;
-       }
+static bool __check_disable_filter_exist(pkgmgrinfo_filter_x *filter)
+{
+       GSList *link;
 
-       for (tmp = list; tmp; tmp = tmp->next) {
-               appid = (char *)tmp->data;
-               if (stop == 0) {
-                       if (_appinfo_get_app(appid, locale, &info)) {
-                               free(appid);
-                               continue;
-                       }
-                       if (app_list_cb(info, user_data) < 0)
-                               stop = 1;
-                       pkgmgrinfo_appinfo_destroy_appinfo(info);
-               }
-               free(appid);
-       }
+       if (filter == NULL)
+               return false;
 
-       free(locale);
-       g_slist_free(list);
-       __close_manifest_db();
+       link = g_slist_find_custom(filter->list, NULL, __app_disable_chk_func);
+       if (link)
+               return true;
 
-       return PMINFO_R_OK;
+       return false;
 }
 
-API int pkgmgrinfo_appinfo_get_usr_list(pkgmgrinfo_pkginfo_h handle,
-               pkgmgrinfo_app_component component,
-               pkgmgrinfo_app_list_cb app_func, void *user_data, uid_t uid)
+static int __bind_params(sqlite3_stmt *stmt, GList *params)
 {
+       GList *tmp_list = NULL;
+       int idx = 0;
        int ret;
-       pkgmgrinfo_appinfo_filter_h filter;
-       char *pkgid;
-       const char *comp_str = NULL;
 
-       if (handle == NULL || app_func == NULL) {
-               LOGE("invalied parameter");
+       if (stmt == NULL || params == NULL)
                return PMINFO_R_EINVAL;
+
+       tmp_list = params;
+       while (tmp_list) {
+               ret = sqlite3_bind_text(stmt, ++idx, (char *)tmp_list->data, -1, SQLITE_STATIC);
+               if (ret != SQLITE_OK)
+                       return PMINFO_R_ERROR;
+               tmp_list = tmp_list->next;
        }
 
-       if (pkgmgrinfo_pkginfo_get_pkgid(handle, &pkgid)) {
-               LOGE("invalid parameter");
-               return PMINFO_R_EINVAL;
+       return PMINFO_R_OK;
+}
+
+static bool __check_app_storage_status(pkgmgrinfo_filter_x *tmp_filter)
+{
+       GSList *tmp_list = NULL;
+       pkgmgrinfo_node_x *tmp_node = NULL;
+       int property = -1;
+
+       if (tmp_filter == NULL)
+               return true;
+
+       property = _pminfo_appinfo_convert_to_prop_bool(PMINFO_APPINFO_PROP_APP_CHECK_STORAGE);
+       for (tmp_list = tmp_filter->list; tmp_list != NULL;
+                       tmp_list = g_slist_next(tmp_list)) {
+               tmp_node = (pkgmgrinfo_node_x *)tmp_list->data;
+               if (property == tmp_node->prop) {
+                       if (strcmp(tmp_node->value, "true") == 0)
+                               return true;
+                       else
+                               return false;
+               }
        }
 
-       if (pkgmgrinfo_appinfo_filter_create(&filter))
+       return true;
+}
+
+static int _appinfo_get_applications(uid_t db_uid, uid_t uid,
+               const char *locale, pkgmgrinfo_filter_x *filter, int flag,
+               GHashTable *applications)
+{
+       static const char query_raw[] =
+               "SELECT DISTINCT ai.app_id, ai.app_component, ai.app_exec, "
+               "ai.app_nodisplay, ai.app_type, ai.app_onboot, "
+               "ai.app_multiple, ai.app_autorestart, ai.app_taskmanage, "
+               "ai.app_hwacceleration, ai.app_screenreader, "
+               "ai.app_mainapp, ai.app_recentimage, ai.app_launchcondition, "
+               "ai.app_indicatordisplay, ai.app_portraitimg, "
+               "ai.app_landscapeimg, ai.app_guestmodevisibility, "
+               "ai.app_permissiontype, ai.app_preload, ai.app_submode, "
+               "ai.app_submode_mainid, ai.app_launch_mode, ai.app_ui_gadget, "
+               "ai.app_support_disable, ai.app_process_pool, "
+               "ai.app_installed_storage, ai.app_background_category, "
+               "ai.app_package_type, ai.app_root_path, ai.app_api_version, "
+               "ai.app_effective_appid, ai.app_disable, "
+               "ai.app_splash_screen_display, ai.app_tep_name, "
+               "ai.app_zip_mount_file, ai.component_type, ai.package, "
+               "ai.app_external_path, ai.app_package_system, ai.app_removable, "
+               "ai.app_package_installed_time, ai.app_support_mode, "
+               "ai.app_support_ambient, ai.app_setup_appid";
+       static const char query_label[] =
+               ", COALESCE("
+               "(SELECT app_label FROM package_app_localized_info WHERE ai.app_id=app_id AND app_locale=?), "
+               "(SELECT app_label FROM package_app_localized_info WHERE ai.app_id=app_id AND app_locale='No Locale'))";
+       static const char query_icon[] =
+               ", COALESCE("
+               "(SELECT app_icon FROM package_app_localized_info WHERE ai.app_id=app_id AND app_locale=?), "
+               "(SELECT app_icon FROM package_app_localized_info WHERE ai.app_id=app_id AND app_locale='No Locale'))";
+       static const char query_from_clause[] = " FROM package_app_info as ai";
+       int ret = PMINFO_R_ERROR;
+       int idx;
+       int len = 0;
+       char *dbpath;
+       char *bg_category_str = NULL;
+       char *constraint = NULL;
+       char *tmp_record = NULL;
+       char query[MAX_QUERY_LEN] = { '\0' };
+       application_x *info = NULL;
+       GList *bind_params = NULL;
+       sqlite3 *db = NULL;
+       sqlite3_stmt *stmt = NULL;
+       bool is_check_storage = true;
+
+       dbpath = getUserPkgParserDBPathUID(db_uid);
+       if (dbpath == NULL)
                return PMINFO_R_ERROR;
 
-       if (pkgmgrinfo_appinfo_filter_add_string(filter,
-                               PMINFO_APPINFO_PROP_APP_PACKAGE, pkgid)) {
-               pkgmgrinfo_appinfo_filter_destroy(filter);
+       ret = __open_db(dbpath, &db, SQLITE_OPEN_READONLY);
+       if (ret != SQLITE_OK) {
+               _LOGE("failed to open db: %d", ret);
+               free(dbpath);
                return PMINFO_R_ERROR;
        }
+       free(dbpath);
 
-
-       switch (component) {
-       case PMINFO_UI_APP:
-               comp_str = PMINFO_APPINFO_UI_APP;
-               break;
-       case PMINFO_SVC_APP:
-               comp_str = PMINFO_APPINFO_SVC_APP;
-               break;
-       default:
-               break;
+       len = strlen(query_raw);
+       snprintf(query, MAX_QUERY_LEN - 1, "%s", query_raw);
+       if (flag & PMINFO_APPINFO_GET_LABEL) {
+               strncat(query, query_label, MAX_QUERY_LEN - len - 1);
+               len += strlen(query_label);
+               bind_params = g_list_append(bind_params, strdup(locale));
+       }
+       if (flag & PMINFO_APPINFO_GET_ICON) {
+               strncat(query, query_icon, MAX_QUERY_LEN - len - 1);
+               len += strlen(query_icon);
+               bind_params = g_list_append(bind_params, strdup(locale));
        }
 
+       is_check_storage = __check_app_storage_status(filter);
+
+       ret = _get_filtered_query(filter, locale, uid, &constraint, &bind_params);
+       if (ret != PMINFO_R_OK) {
+               LOGE("Failed to get WHERE clause");
+               goto catch;
+       }
+       strncat(query, query_from_clause, MAX_QUERY_LEN - len - 1);
+       len += strlen(query_from_clause);
+
+       if (constraint)
+               strncat(query, constraint, MAX_QUERY_LEN - len - 1);
+
+       ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL);
+       if (ret != SQLITE_OK) {
+               LOGE("prepare failed: %s", sqlite3_errmsg(db));
+               ret = PMINFO_R_ERROR;
+               goto catch;
+       }
+
+       if (g_list_length(bind_params) != 0) {
+               ret = __bind_params(stmt, bind_params);
+               if (ret != SQLITE_OK) {
+                       LOGE("Failed to bind parameters");
+                       goto catch;
+               }
+       }
+
+       while (sqlite3_step(stmt) == SQLITE_ROW) {
+               info = calloc(1, sizeof(application_x));
+               if (info == NULL) {
+                       LOGE("out of memory");
+                       ret = PMINFO_R_ERROR;
+                       goto catch;
+               }
+               idx = 0;
+               _save_column_str(stmt, idx++, &info->appid);
+               if (g_hash_table_contains(applications,
+                                       (gconstpointer)info->appid)) {
+                       free(info->appid);
+                       free(info);
+                       info = NULL;
+                       continue;
+               }
+               _save_column_str(stmt, idx++, &info->component);
+               _save_column_str(stmt, idx++, &info->exec);
+               _save_column_str(stmt, idx++, &info->nodisplay);
+               _save_column_str(stmt, idx++, &info->type);
+               _save_column_str(stmt, idx++, &info->onboot);
+               _save_column_str(stmt, idx++, &info->multiple);
+               _save_column_str(stmt, idx++, &info->autorestart);
+               _save_column_str(stmt, idx++, &info->taskmanage);
+               _save_column_str(stmt, idx++, &info->hwacceleration);
+               _save_column_str(stmt, idx++, &info->screenreader);
+               _save_column_str(stmt, idx++, &info->mainapp);
+               _save_column_str(stmt, idx++, &info->recentimage);
+               _save_column_str(stmt, idx++, &info->launchcondition);
+               _save_column_str(stmt, idx++, &info->indicatordisplay);
+               _save_column_str(stmt, idx++, &info->portraitimg);
+               _save_column_str(stmt, idx++, &info->landscapeimg);
+               _save_column_str(stmt, idx++, &info->guestmode_visibility);
+               _save_column_str(stmt, idx++, &info->permission_type);
+               _save_column_str(stmt, idx++, &info->preload);
+               _save_column_str(stmt, idx++, &info->submode);
+               _save_column_str(stmt, idx++, &info->submode_mainid);
+               _save_column_str(stmt, idx++, &info->launch_mode);
+               _save_column_str(stmt, idx++, &info->ui_gadget);
+               _save_column_str(stmt, idx++, &info->support_disable);
+               _save_column_str(stmt, idx++, &info->process_pool);
+               _save_column_str(stmt, idx++, &info->installed_storage);
+               _save_column_str(stmt, idx++, &bg_category_str);
+               _save_column_str(stmt, idx++, &info->package_type);
+               _save_column_str(stmt, idx++, &info->root_path);
+               _save_column_str(stmt, idx++, &info->api_version);
+               _save_column_str(stmt, idx++, &info->effective_appid);
+               _save_column_str(stmt, idx++, &info->is_disabled);
+               _save_column_str(stmt, idx++, &info->splash_screen_display);
+               _save_column_str(stmt, idx++, &info->tep_name);
+               _save_column_str(stmt, idx++, &info->zip_mount_file);
+               _save_column_str(stmt, idx++, &info->component_type);
+               _save_column_str(stmt, idx++, &info->package);
+               _save_column_str(stmt, idx++, &info->external_path);
+               _save_column_str(stmt, idx++, &info->package_system);
+               _save_column_str(stmt, idx++, &info->removable);
+               _save_column_str(stmt, idx++, &info->package_installed_time);
+               _save_column_str(stmt, idx++, &info->support_mode);
+               _save_column_str(stmt, idx++, &info->support_ambient);
+               _save_column_str(stmt, idx++, &info->setup_appid);
+
+               info->for_all_users =
+                       strdup((db_uid != GLOBAL_USER) ? "false" : "true");
+
+               if (db_uid == GLOBAL_USER) {
+                       ret = __get_appinfo_for_uid(db, info, uid);
+                       if (ret != PMINFO_R_OK) {
+                               LOGI("Failed to get appinfo for given uid[%d]", (int)uid);
+                               pkgmgrinfo_basic_free_application(info);
+                               info = NULL;
+                               continue;
+                       }
+               }
+
+               info->background_category = __get_background_category(
+                               bg_category_str);
+               free(bg_category_str);
+
+               if (flag & PMINFO_APPINFO_GET_LABEL) {
+                       tmp_record = NULL;
+                       _save_column_str(stmt, idx++, &tmp_record);
+                       if (_add_label_info_into_list(locale, tmp_record, &info->label)) {
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
+                       }
+               }
+
+               if (flag & PMINFO_APPINFO_GET_ICON) {
+                       tmp_record = NULL;
+                       _save_column_str(stmt, idx++, &tmp_record);
+                       if (_add_icon_info_into_list(locale, tmp_record, &info->icon)) {
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
+                       }
+               }
+
+               if (flag & PMINFO_APPINFO_GET_CATEGORY) {
+                       if (_appinfo_get_category(db, info->appid,
+                                               &info->category)) {
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
+                       }
+               }
+
+               if (flag & PMINFO_APPINFO_GET_APP_CONTROL) {
+                       if (_appinfo_get_app_control(db, info->appid,
+                                               &info->appcontrol)) {
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
+                       }
+               }
+
+               if (flag & PMINFO_APPINFO_GET_DATA_CONTROL) {
+                       if (_appinfo_get_data_control(db, info->appid,
+                                               &info->datacontrol)) {
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
+                       }
+               }
+
+               if (flag & PMINFO_APPINFO_GET_METADATA) {
+                       if (_appinfo_get_metadata(db, info->appid,
+                                               &info->metadata)) {
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
+                       }
+               }
+
+               if (flag & PMINFO_APPINFO_GET_SPLASH_SCREEN) {
+                       if (_appinfo_get_splashscreens(db, info->appid,
+                                               &info->splashscreens)) {
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
+                       }
+               }
+
+               if (is_check_storage &&
+                               __appinfo_check_installed_storage(info) != PMINFO_R_OK) {
+                       ret = PMINFO_R_ERROR;
+                       pkgmgrinfo_basic_free_application(info);
+                       info = NULL;
+                       continue;
+               }
+
+               g_hash_table_insert(applications, (gpointer)info->appid,
+                               (gpointer)info);
+       }
+
+       ret = PMINFO_R_OK;
+
+catch:
+       if (constraint)
+               free(constraint);
+
+       if (ret != PMINFO_R_OK && info != NULL)
+               pkgmgrinfo_basic_free_application(info);
+
+       g_list_free_full(bind_params, free);
+       sqlite3_close_v2(db);
+       sqlite3_finalize(stmt);
+
+       return ret;
+}
+
+static int _pkgmgrinfo_get_appinfo(const char *appid, uid_t uid,
+       pkgmgrinfo_appinfo_filter_h filter, pkgmgrinfo_appinfo_h *handle)
+{
+       int ret;
+       char *locale;
+       GHashTable *list;
+       pkgmgr_appinfo_x *info;
+
+       if (appid == NULL || filter == NULL || handle == NULL) {
+                       LOGE("invalid parameter");
+                       return PMINFO_R_EINVAL;
+       }
+
+       locale = _get_system_locale();
+       if (locale == NULL)
+               return PMINFO_R_ERROR;
+
+       list = g_hash_table_new(g_str_hash, g_str_equal);
+       if (list == NULL) {
+               free(locale);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = _appinfo_get_applications(uid, uid, locale, filter,
+                       PMINFO_APPINFO_GET_ALL, list);
+       if (!g_hash_table_size(list) && uid != GLOBAL_USER)
+               ret = _appinfo_get_applications(GLOBAL_USER, uid, locale, filter,
+                               PMINFO_APPINFO_GET_ALL, list);
+
+       if (!g_hash_table_size(list)) {
+               _LOGI("appinfo for [%s] is not existed for user [%d]",
+                               appid, uid);
+               g_hash_table_destroy(list);
+               free(locale);
+               return PMINFO_R_ENOENT;
+       }
+
+       info = calloc(1, sizeof(pkgmgr_appinfo_x));
+       if (info == NULL) {
+               _LOGE("out of memory");
+               g_hash_table_destroy(list);
+               free(locale);
+               return PMINFO_R_ERROR;
+       }
+
+       info->app_info = (application_x *)g_hash_table_lookup(list, appid);
+       info->locale = locale;
+       info->package = strdup(info->app_info->package);
+
+       /* just free list only */
+       g_hash_table_destroy(list);
+
+       *handle = info;
+
+       return ret;
+}
+
+API int pkgmgrinfo_appinfo_get_usr_disabled_appinfo(const char *appid, uid_t uid,
+               pkgmgrinfo_appinfo_h *handle)
+{
+       int ret;
+       pkgmgrinfo_appinfo_filter_h filter;
+
+       if (appid == NULL || handle == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       ret = pkgmgrinfo_appinfo_filter_create(&filter);
+       if (ret != PMINFO_R_OK)
+               return ret;
+
+       ret = pkgmgrinfo_appinfo_filter_add_string(filter,
+                       PMINFO_APPINFO_PROP_APP_ID, appid);
+       if (ret != PMINFO_R_OK) {
+               pkgmgrinfo_appinfo_filter_destroy(filter);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = pkgmgrinfo_appinfo_filter_add_bool(filter,
+                       PMINFO_APPINFO_PROP_APP_DISABLE, true);
+       if (ret != PMINFO_R_OK) {
+               pkgmgrinfo_appinfo_filter_destroy(filter);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = _pkgmgrinfo_get_appinfo(appid, uid, filter, handle);
+       pkgmgrinfo_appinfo_filter_destroy(filter);
+
+       return ret;
+}
+
+API int pkgmgrinfo_appinfo_get_disabled_appinfo(const char *appid, pkgmgrinfo_appinfo_h *handle)
+{
+       return pkgmgrinfo_appinfo_get_usr_disabled_appinfo(appid, _getuid(), handle);
+}
+
+API int pkgmgrinfo_appinfo_get_usr_appinfo(const char *appid, uid_t uid,
+               pkgmgrinfo_appinfo_h *handle)
+{
+       int ret;
+       pkgmgrinfo_appinfo_filter_h filter;
+
+       if (appid == NULL || handle == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       ret = pkgmgrinfo_appinfo_filter_create(&filter);
+       if (ret != PMINFO_R_OK)
+               return ret;
+
+       ret = pkgmgrinfo_appinfo_filter_add_string(filter,
+                       PMINFO_APPINFO_PROP_APP_ID, appid);
+       if (ret != PMINFO_R_OK) {
+               pkgmgrinfo_appinfo_filter_destroy(filter);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = pkgmgrinfo_appinfo_filter_add_bool(filter,
+                       PMINFO_APPINFO_PROP_APP_DISABLE, false);
+       if (ret != PMINFO_R_OK) {
+               pkgmgrinfo_appinfo_filter_destroy(filter);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = _pkgmgrinfo_get_appinfo(appid, uid, filter, handle);
+       pkgmgrinfo_appinfo_filter_destroy(filter);
+       return ret;
+}
+
+API int pkgmgrinfo_appinfo_get_appinfo(const char *appid, pkgmgrinfo_appinfo_h *handle)
+{
+       return pkgmgrinfo_appinfo_get_usr_appinfo(appid, _getuid(), handle);
+}
+
+API int pkgmgrinfo_appinfo_get_usr_all_appinfo(const char *appid, uid_t uid,
+               pkgmgrinfo_appinfo_h *handle)
+{
+       int ret;
+       pkgmgrinfo_appinfo_filter_h filter;
+
+       if (appid == NULL || handle == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       ret = pkgmgrinfo_appinfo_filter_create(&filter);
+       if (ret != PMINFO_R_OK)
+               return ret;
+
+       ret = pkgmgrinfo_appinfo_filter_add_string(filter,
+                       PMINFO_APPINFO_PROP_APP_ID, appid);
+       if (ret != PMINFO_R_OK) {
+               pkgmgrinfo_appinfo_filter_destroy(filter);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = pkgmgrinfo_appinfo_filter_add_bool(filter,
+                       PMINFO_APPINFO_PROP_APP_CHECK_STORAGE, false);
+       if (ret != PMINFO_R_OK) {
+               pkgmgrinfo_appinfo_filter_destroy(filter);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = _pkgmgrinfo_get_appinfo(appid, uid, filter, handle);
+       pkgmgrinfo_appinfo_filter_destroy(filter);
+
+       return ret;
+}
+
+API int pkgmgrinfo_appinfo_get_all_appinfo(const char *appid, pkgmgrinfo_appinfo_h *handle)
+{
+       return pkgmgrinfo_appinfo_get_usr_all_appinfo(appid, _getuid(), handle);
+}
+
+static gpointer __copy_str(gconstpointer src, gpointer data)
+{
+       const char *tmp = (const char *)src;
+       char *buffer;
+
+       buffer = strdup(tmp);
+       if (buffer == NULL) {
+               LOGE("memory alloc failed");
+               *(int *)data = -1;
+               return NULL;
+       }
+
+       return buffer;
+}
+
+static gpointer __copy_label(gconstpointer src, gpointer data)
+{
+       label_x *tmp = (label_x *)src;
+       label_x *label;
+
+       label = calloc(1, sizeof(label_x));
+       if (label == NULL) {
+               LOGE("memory alloc failed");
+               *(int *)data = -1;
+               return NULL;
+       }
+
+       if (tmp->name)
+               label->name = strdup(tmp->name);
+       if (tmp->text)
+               label->text = strdup(tmp->text);
+       if (tmp->lang)
+               label->lang = strdup(tmp->lang);
+
+       return label;
+}
+
+static gpointer __copy_icon(gconstpointer src, gpointer data)
+{
+       icon_x *tmp = (icon_x *)src;
+       icon_x *icon;
+
+       icon = calloc(1, sizeof(icon_x));
+       if (icon == NULL) {
+               LOGE("memory alloc failed");
+               *(int *)data = -1;
+               return NULL;
+       }
+
+       if (tmp->text)
+               icon->text = strdup(tmp->text);
+       if (tmp->lang)
+               icon->lang = strdup(tmp->lang);
+       if (tmp->section)
+               icon->section = strdup(tmp->section);
+       if (tmp->size)
+               icon->size = strdup(tmp->size);
+       if (tmp->resolution)
+               icon->resolution = strdup(tmp->resolution);
+
+       return icon;
+}
+
+static gpointer __copy_metadata(gconstpointer src, gpointer data)
+{
+       metadata_x *tmp = (metadata_x *)src;
+       metadata_x *metadata;
+
+       metadata = calloc(1, sizeof(metadata_x));
+       if (metadata == NULL) {
+               LOGE("memory alloc failed");
+               *(int *)data = -1;
+               return NULL;
+       }
+
+       if (tmp->key)
+               metadata->key = strdup(tmp->key);
+       if (tmp->value)
+               metadata->value = strdup(tmp->value);
+
+       return metadata;
+}
+
+static gpointer __copy_datacontrol(gconstpointer src, gpointer data)
+{
+       datacontrol_x *tmp = (datacontrol_x *)src;
+       datacontrol_x *datacontrol;
+
+       datacontrol = calloc(1, sizeof(datacontrol_x));
+       if (datacontrol == NULL) {
+               LOGE("memory alloc failed");
+               *(int *)data = -1;
+               return NULL;
+       }
+
+       if (tmp->providerid)
+               datacontrol->providerid = strdup(tmp->providerid);
+       if (tmp->access)
+               datacontrol->access = strdup(tmp->access);
+       if (tmp->type)
+               datacontrol->type = strdup(tmp->type);
+       if (tmp->trusted)
+               datacontrol->trusted = strdup(tmp->trusted);
+
+       return datacontrol;
+}
+
+static gpointer __copy_appcontrol(gconstpointer src, gpointer data)
+{
+       appcontrol_x *tmp = (appcontrol_x *)src;
+       appcontrol_x *appcontrol;
+
+       appcontrol = calloc(1, sizeof(appcontrol_x));
+       if (appcontrol == NULL) {
+               LOGE("memory alloc failed");
+               *(int *)data = -1;
+               return NULL;
+       }
+
+       if (tmp->operation)
+               appcontrol->operation = strdup(tmp->operation);
+       if (tmp->uri)
+               appcontrol->uri = strdup(tmp->uri);
+       if (tmp->mime)
+               appcontrol->mime = strdup(tmp->mime);
+
+       return appcontrol;
+}
+
+static gpointer __copy_splashscreens(gconstpointer src, gpointer data)
+{
+       splashscreen_x *tmp = (splashscreen_x *)src;
+       splashscreen_x *splashscreen;
+
+       splashscreen = (splashscreen_x *)calloc(1, sizeof(splashscreen_x));
+       if (splashscreen == NULL) {
+               LOGE("memory alloc failed");
+               *(int *)data = -1;
+               return NULL;
+       }
+
+       if (tmp->src)
+               splashscreen->src = strdup(tmp->src);
+       if (tmp->type)
+               splashscreen->type = strdup(tmp->type);
+       if (tmp->orientation)
+               splashscreen->orientation = strdup(tmp->orientation);
+       if (tmp->indicatordisplay)
+               splashscreen->indicatordisplay = strdup(tmp->indicatordisplay);
+       if (tmp->operation)
+               splashscreen->operation = strdup(tmp->operation);
+       if (tmp->color_depth)
+               splashscreen->color_depth = strdup(tmp->color_depth);
+
+       return splashscreen;
+}
+
+static int _appinfo_copy_appinfo(application_x **application, application_x *data)
+{
+       application_x *app_info;
+       int ret;
+
+       app_info = calloc(1, sizeof(application_x));
+       if (app_info == NULL) {
+               LOGE("memory alloc failed");
+               return PMINFO_R_ERROR;
+       }
+
+       if (data->appid != NULL)
+               app_info->appid = strdup(data->appid);
+       if (data->exec != NULL)
+               app_info->exec = strdup(data->exec);
+       if (data->nodisplay != NULL)
+               app_info->nodisplay = strdup(data->nodisplay);
+       if (data->multiple != NULL)
+               app_info->multiple = strdup(data->multiple);
+       if (data->taskmanage != NULL)
+               app_info->taskmanage = strdup(data->taskmanage);
+       if (data->type != NULL)
+               app_info->type = strdup(data->type);
+       if (data->categories != NULL)
+               app_info->categories = strdup(data->categories);
+       if (data->hwacceleration != NULL)
+               app_info->hwacceleration = strdup(data->hwacceleration);
+       if (data->screenreader != NULL)
+               app_info->screenreader = strdup(data->screenreader);
+       if (data->mainapp != NULL)
+               app_info->mainapp = strdup(data->mainapp);
+       if (data->package != NULL)
+               app_info->package = strdup(data->package);
+       if (data->recentimage != NULL)
+               app_info->recentimage = strdup(data->recentimage);
+       if (data->launchcondition != NULL)
+               app_info->launchcondition = strdup(data->launchcondition);
+       if (data->indicatordisplay != NULL)
+               app_info->indicatordisplay = strdup(data->indicatordisplay);
+       if (data->portraitimg != NULL)
+               app_info->portraitimg = strdup(data->portraitimg);
+       if (data->landscapeimg != NULL)
+               app_info->landscapeimg = strdup(data->landscapeimg);
+       if (data->guestmode_visibility != NULL)
+               app_info->guestmode_visibility = strdup(data->guestmode_visibility);
+       if (data->component != NULL)
+               app_info->component = strdup(data->component);
+       if (data->permission_type != NULL)
+               app_info->permission_type = strdup(data->permission_type);
+       if (data->component_type != NULL)
+               app_info->component_type = strdup(data->component_type);
+       if (data->preload != NULL)
+               app_info->preload = strdup(data->preload);
+       if (data->submode != NULL)
+               app_info->submode = strdup(data->submode);
+       if (data->submode_mainid != NULL)
+               app_info->submode_mainid = strdup(data->submode_mainid);
+       if (data->process_pool != NULL)
+               app_info->process_pool = strdup(data->process_pool);
+       if (data->installed_storage != NULL)
+               app_info->installed_storage = strdup(data->installed_storage);
+       if (data->autorestart != NULL)
+               app_info->autorestart = strdup(data->autorestart);
+       if (data->onboot != NULL)
+               app_info->onboot = strdup(data->onboot);
+       if (data->support_disable != NULL)
+               app_info->support_disable = strdup(data->support_disable);
+       if (data->ui_gadget != NULL)
+               app_info->ui_gadget = strdup(data->ui_gadget);
+       if (data->launch_mode != NULL)
+               app_info->launch_mode = strdup(data->launch_mode);
+       if (data->package_type != NULL)
+               app_info->package_type = strdup(data->package_type);
+       if (data->effective_appid != NULL)
+               app_info->effective_appid = strdup(data->effective_appid);
+       if (data->splash_screen_display != NULL)
+               app_info->splash_screen_display = strdup(data->splash_screen_display);
+
+       /* GList */
+       ret = 0;
+       app_info->label = g_list_copy_deep(data->label, __copy_label, &ret);
+       if (ret < 0) {
+               LOGE("memory alloc failed");
+               pkgmgrinfo_basic_free_application(app_info);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = 0;
+       app_info->icon = g_list_copy_deep(data->icon, __copy_icon, &ret);
+       if (ret < 0) {
+               LOGE("memory alloc failed");
+               pkgmgrinfo_basic_free_application(app_info);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = 0;
+       app_info->category = g_list_copy_deep(data->category, __copy_str, &ret);
+       if (ret < 0) {
+               LOGE("memory alloc failed");
+               pkgmgrinfo_basic_free_application(app_info);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = 0;
+       app_info->metadata = g_list_copy_deep(data->metadata, __copy_metadata, &ret);
+       if (ret < 0) {
+               LOGE("memory alloc failed");
+               pkgmgrinfo_basic_free_application(app_info);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = 0;
+       app_info->datacontrol = g_list_copy_deep(data->datacontrol, __copy_datacontrol, &ret);
+       if (ret < 0) {
+               LOGE("memory alloc failed");
+               pkgmgrinfo_basic_free_application(app_info);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = 0;
+       app_info->appcontrol = g_list_copy_deep(data->appcontrol, __copy_appcontrol, &ret);
+       if (ret < 0) {
+               LOGE("memory alloc failed");
+               pkgmgrinfo_basic_free_application(app_info);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = 0;
+       app_info->background_category = g_list_copy_deep(data->background_category, __copy_str, &ret);
+       if (ret < 0) {
+               LOGE("memory alloc failed");
+               pkgmgrinfo_basic_free_application(app_info);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = 0;
+       app_info->splashscreens = g_list_copy_deep(data->splashscreens, __copy_splashscreens, &ret);
+       if (ret < 0) {
+               LOGE("memory alloc failed");
+               pkgmgrinfo_basic_free_application(app_info);
+               return PMINFO_R_ERROR;
+       }
+
+       *application = app_info;
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_clone_appinfo(pkgmgrinfo_appinfo_h handle,
+               pkgmgrinfo_appinfo_h *clone)
+{
+       pkgmgr_appinfo_x *info;
+       pkgmgr_appinfo_x *temp = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL)
+               return PMINFO_R_EINVAL;
+
+       info = calloc(1, sizeof(pkgmgr_appinfo_x));
+       if (info == NULL) {
+               LOGE("memory alloc failed");
+               return PMINFO_R_ERROR;
+       }
+
+       if (temp->package != NULL)
+               info->package = strdup(temp->package);
+       if (temp->locale != NULL)
+               info->locale = strdup(temp->locale);
+
+       info->app_component = temp->app_component;
+
+       if (_appinfo_copy_appinfo(&info->app_info, temp->app_info) < 0) {
+               LOGE("appinfo copy failed");
+               if (info->package)
+                       free((void *)info->package);
+               if (info->locale)
+                       free(info->locale);
+               free(info);
+               return PMINFO_R_ERROR;
+       }
+
+       *clone = info;
+
+       return PMINFO_R_OK;
+}
+
+static int _appinfo_get_filtered_foreach_appinfo(uid_t uid,
+               pkgmgrinfo_filter_x *filter, int flag, pkgmgrinfo_app_list_cb app_list_cb,
+               void *user_data)
+{
+       int ret;
+       char *locale;
+       application_x *app;
+       pkgmgr_appinfo_x info;
+       GHashTable *list;
+       GHashTableIter iter;
+       gpointer value;
+
+       locale = _get_system_locale();
+       if (locale == NULL)
+               return PMINFO_R_ERROR;
+
+       list = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
+                       __free_applications);
+       if (list == NULL) {
+               free(locale);
+               return PMINFO_R_ERROR;
+       }
+
+       if (__check_disable_filter_exist(filter) == false) {
+               pkgmgrinfo_appinfo_filter_add_bool(filter,
+                               PMINFO_APPINFO_PROP_APP_DISABLE, false);
+       }
+
+       ret = _appinfo_get_applications(uid, uid, locale, filter, flag, list);
+       if (ret == PMINFO_R_OK && uid != GLOBAL_USER)
+               ret = _appinfo_get_applications(GLOBAL_USER, uid, locale,
+                               filter, flag, list);
+
+       if (ret != PMINFO_R_OK) {
+               g_hash_table_destroy(list);
+               free(locale);
+               return ret;
+       }
+
+       g_hash_table_iter_init(&iter, list);
+       while (g_hash_table_iter_next(&iter, NULL, &value)) {
+               app = (application_x *)value;
+               info.app_info = app;
+               info.locale = locale;
+               info.package = app->package;
+               if (app_list_cb(&info, user_data) < 0)
+                       break;
+       }
+       g_hash_table_destroy(list);
+       free(locale);
+
+       return PMINFO_R_OK;
+}
+
+static const char *__appcomponent_str(pkgmgrinfo_app_component comp);
+
+API int pkgmgrinfo_appinfo_get_usr_list(pkgmgrinfo_pkginfo_h handle,
+               pkgmgrinfo_app_component component,
+               pkgmgrinfo_app_list_cb app_func, void *user_data, uid_t uid)
+{
+       int ret;
+       pkgmgrinfo_appinfo_filter_h filter;
+       char *pkgid;
+       const char *comp_str = NULL;
+
+       if (handle == NULL || app_func == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (pkgmgrinfo_pkginfo_get_pkgid(handle, &pkgid)) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (pkgmgrinfo_appinfo_filter_create(&filter))
+               return PMINFO_R_ERROR;
+
+       if (pkgmgrinfo_appinfo_filter_add_string(filter,
+                               PMINFO_APPINFO_PROP_APP_PACKAGE, pkgid)) {
+               pkgmgrinfo_appinfo_filter_destroy(filter);
+               return PMINFO_R_ERROR;
+       }
+
+       comp_str = __appcomponent_str(component);
+
        if (comp_str) {
                if (pkgmgrinfo_appinfo_filter_add_string(filter,
                                        PMINFO_APPINFO_PROP_APP_COMPONENT,
@@ -743,50 +1418,92 @@ API int pkgmgrinfo_appinfo_get_usr_list(pkgmgrinfo_pkginfo_h handle,
                }
        }
 
-       ret = _appinfo_get_filtered_foreach_appinfo(uid, filter, app_func,
-                       user_data);
+       ret = _appinfo_get_filtered_foreach_appinfo(uid, filter,
+                       PMINFO_APPINFO_GET_ALL, app_func, user_data);
 
        pkgmgrinfo_appinfo_filter_destroy(filter);
 
        return ret;
 }
 
-API int pkgmgrinfo_appinfo_get_list(pkgmgrinfo_pkginfo_h handle, pkgmgrinfo_app_component component,
-                                               pkgmgrinfo_app_list_cb app_func, void *user_data)
+API int pkgmgrinfo_appinfo_get_list(pkgmgrinfo_pkginfo_h handle,
+               pkgmgrinfo_app_component component,
+               pkgmgrinfo_app_list_cb app_func, void *user_data)
 {
-       return pkgmgrinfo_appinfo_get_usr_list(handle, component, app_func, user_data, GLOBAL_USER);
+       return pkgmgrinfo_appinfo_get_usr_list(handle, component, app_func, user_data, _getuid());
 }
 
-API int pkgmgrinfo_appinfo_get_usr_install_list(pkgmgrinfo_app_list_cb app_func, uid_t uid, void *user_data)
+API int pkgmgrinfo_appinfo_get_usr_installed_list_full(
+               pkgmgrinfo_app_list_cb app_func, uid_t uid, int flag,
+               void *user_data)
 {
+       int ret;
+       pkgmgrinfo_appinfo_filter_h filter;
+
        if (app_func == NULL) {
                LOGE("invalid parameter");
                return PMINFO_R_EINVAL;
        }
 
-       return _appinfo_get_filtered_foreach_appinfo(uid, NULL, app_func,
+       if (pkgmgrinfo_appinfo_filter_create(&filter))
+               return PMINFO_R_ERROR;
+
+       if (pkgmgrinfo_appinfo_filter_add_bool(filter,
+                               PMINFO_APPINFO_PROP_APP_DISABLE, false)) {
+               pkgmgrinfo_appinfo_filter_destroy(filter);
+               return PMINFO_R_ERROR;
+       }
+
+       if (pkgmgrinfo_appinfo_filter_add_bool(filter,
+                       PMINFO_APPINFO_PROP_APP_CHECK_STORAGE, false)) {
+               pkgmgrinfo_appinfo_filter_destroy(filter);
+               return PMINFO_R_ERROR;
+       }
+
+       ret = _appinfo_get_filtered_foreach_appinfo(uid, filter, flag, app_func,
                        user_data);
+
+       pkgmgrinfo_appinfo_filter_destroy(filter);
+
+       return ret;
 }
 
-API int pkgmgrinfo_appinfo_get_install_list(pkgmgrinfo_app_list_cb app_func, void *user_data)
+API int pkgmgrinfo_appinfo_get_installed_list_full(
+               pkgmgrinfo_app_list_cb app_func, int flag, void *user_data)
 {
-       return pkgmgrinfo_appinfo_get_usr_install_list(app_func, GLOBAL_USER, user_data);
+       return pkgmgrinfo_appinfo_get_usr_installed_list_full(app_func,
+                       _getuid(), flag, user_data);
 }
 
-API int pkgmgrinfo_appinfo_get_usr_installed_list(pkgmgrinfo_app_list_cb app_func, uid_t uid, void *user_data)
+API int pkgmgrinfo_appinfo_get_usr_installed_list(
+               pkgmgrinfo_app_list_cb app_func, uid_t uid, void *user_data)
 {
+       int ret;
+       pkgmgrinfo_appinfo_filter_h filter;
+
        if (app_func == NULL) {
                LOGE("invalid parameter");
                return PMINFO_R_EINVAL;
        }
 
-       return _appinfo_get_filtered_foreach_appinfo(uid, NULL, app_func,
-                       user_data);
+       /* create an empty filter */
+       ret = pkgmgrinfo_appinfo_filter_create(&filter);
+       if (ret != PMINFO_R_OK)
+               return ret;
+
+       ret = _appinfo_get_filtered_foreach_appinfo(uid, filter,
+                       PMINFO_APPINFO_GET_ALL, app_func, user_data);
+
+       pkgmgrinfo_appinfo_filter_destroy(filter);
+
+       return ret;
 }
 
-API int pkgmgrinfo_appinfo_get_installed_list(pkgmgrinfo_app_list_cb app_func, void *user_data)
+API int pkgmgrinfo_appinfo_get_installed_list(pkgmgrinfo_app_list_cb app_func,
+               void *user_data)
 {
-       return pkgmgrinfo_appinfo_get_usr_installed_list(app_func, GLOBAL_USER, user_data);
+       return pkgmgrinfo_appinfo_get_usr_installed_list(app_func, _getuid(),
+                       user_data);
 }
 
 API int pkgmgrinfo_appinfo_get_appid(pkgmgrinfo_appinfo_h handle, char **appid)
@@ -833,6 +1550,17 @@ API int pkgmgrinfo_appinfo_get_pkgid(pkgmgrinfo_appinfo_h handle, char **pkgid)
        return PMINFO_R_OK;
 }
 
+API int pkgmgrinfo_appinfo_get_pkgtype(pkgmgrinfo_appinfo_h  handle, char **pkgtype)
+{
+       retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
+       retvm_if(pkgtype == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       *pkgtype = (char *)info->app_info->package_type;
+
+       return PMINFO_R_OK;
+}
+
 API int pkgmgrinfo_appinfo_get_exec(pkgmgrinfo_appinfo_h handle, char **exec)
 {
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
@@ -850,73 +1578,54 @@ API int pkgmgrinfo_appinfo_get_exec(pkgmgrinfo_appinfo_h handle, char **exec)
 
 API int pkgmgrinfo_appinfo_get_icon(pkgmgrinfo_appinfo_h handle, char **icon)
 {
-        char *locale;
-        icon_x *ptr;
-        icon_x *start;
-        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+       icon_x *ptr;
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
        retvm_if(icon == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
 
-       locale = info->locale;
-       retvm_if(locale == NULL, PMINFO_R_ERROR, "manifest locale is NULL");
-
-       start = info->app_info->icon;
-       for (ptr = start; ptr != NULL; ptr = ptr->next) {
-               if (ptr->lang == NULL)
-                       continue;
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
 
-               if (strcmp(ptr->lang, locale) == 0) {
-                       *icon = (char *)ptr->text;
-                       if (strcasecmp(*icon, "(null)") == 0) {
-                               locale = DEFAULT_LOCALE;
-                               continue;
-                       } else {
-                               return PMINFO_R_OK;
-                       }
-               } else if (strcmp(ptr->lang, DEFAULT_LOCALE) == 0) {
-                       *icon = (char *)ptr->text;
-                       return PMINFO_R_OK;
-               }
+       if (info->app_info->icon == NULL) {
+               *icon = "";
+               return PMINFO_R_OK;
        }
 
-       return PMINFO_R_ERROR;
+       ptr = (icon_x *)info->app_info->icon->data;
+       if (ptr == NULL)
+               return PMINFO_R_ERROR;
+
+       if (ptr->text == NULL)
+               return PMINFO_R_ERROR;
+               else
+                       *icon = ptr->text;
+
+       return PMINFO_R_OK;
 }
 
 
 API int pkgmgrinfo_appinfo_get_label(pkgmgrinfo_appinfo_h handle, char **label)
 {
-       char *locale;
        label_x *ptr;
-       label_x *start;
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
        retvm_if(label == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
 
-       locale = info->locale;
-       retvm_if(locale == NULL, PMINFO_R_ERROR, "manifest locale is NULL");
+       if (info->app_info == NULL || info->app_info->label == NULL)
+               return PMINFO_R_ERROR;
 
-       start = info->app_info->label;
-       for (ptr = start; ptr != NULL; ptr = ptr->next) {
-               if (ptr->lang == NULL)
-                       continue;
+       ptr = (label_x *)info->app_info->label->data;
+       if (ptr == NULL)
+               return PMINFO_R_ERROR;
 
-               if (strcmp(ptr->lang, locale) == 0) {
-                       *label = (char *)ptr->text;
-                       if (strcasecmp(*label, "(null)") == 0) {
-                               locale = DEFAULT_LOCALE;
-                               continue;
-                       } else {
-                               return PMINFO_R_OK;
-                       }
-               } else if (strcmp(ptr->lang, DEFAULT_LOCALE) == 0) {
-                       *label = (char *)ptr->text;
-                       return PMINFO_R_OK;
-               }
-       }
+       if (ptr->text == NULL)
+               return PMINFO_R_ERROR;
+       else
+               *label = ptr->text;
 
-       return PMINFO_R_ERROR;
+       return PMINFO_R_OK;
 }
 
 static char *_get_localed_label(const char *appid, const char *locale, uid_t uid)
@@ -926,18 +1635,20 @@ static char *_get_localed_label(const char *appid, const char *locale, uid_t uid
        sqlite3_stmt *stmt = NULL;
        sqlite3 *db = NULL;
        char *val;
-       const char *manifest_db;
+       char *parser_db;
 
-       manifest_db = getUserPkgParserDBPathUID(uid);
-       if (manifest_db == NULL) {
-               _LOGE("Failed to get manifest db path");
+       parser_db = getUserPkgParserDBPathUID(uid);
+       if (parser_db == NULL) {
+               _LOGE("Failed to get parser db path");
                goto err;
        }
 
-       if (sqlite3_open_v2(manifest_db, &db, SQLITE_OPEN_READONLY, NULL) != SQLITE_OK) {
+       if (__open_db(parser_db, &db, SQLITE_OPEN_READONLY) != SQLITE_OK) {
                _LOGE("DB open fail\n");
+               free(parser_db);
                goto err;
        }
+       free(parser_db);
 
        query = sqlite3_mprintf("select app_label from package_app_localized_info where app_id=%Q and app_locale=%Q", appid, locale);
        if (query == NULL) {
@@ -974,6 +1685,12 @@ API int pkgmgrinfo_appinfo_usr_get_localed_label(const char *appid, const char *
        if (val == NULL)
                val = _get_localed_label(appid, DEFAULT_LOCALE, uid);
 
+       if (val == NULL) {
+               val = _get_localed_label(appid, locale, GLOBAL_USER);
+               if (val == NULL)
+                       val = _get_localed_label(appid, DEFAULT_LOCALE, GLOBAL_USER);
+       }
+
        if (val == NULL)
                return PMINFO_R_ERROR;
 
@@ -984,19 +1701,67 @@ API int pkgmgrinfo_appinfo_usr_get_localed_label(const char *appid, const char *
 
 API int pkgmgrinfo_appinfo_get_localed_label(const char *appid, const char *locale, char **label)
 {
-       return pkgmgrinfo_appinfo_usr_get_localed_label(appid, locale, GLOBAL_USER, label);
+       return pkgmgrinfo_appinfo_usr_get_localed_label(appid, locale, _getuid(), label);
+}
+
+API int pkgmgrinfo_appinfo_get_metadata_value(pkgmgrinfo_appinfo_h handle, const char *metadata_key, char **metadata_value)
+{
+       retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
+       retvm_if(metadata_key == NULL, PMINFO_R_EINVAL, "metadata_key is NULL");
+       retvm_if(metadata_value == NULL, PMINFO_R_EINVAL, "metadata_value is NULL");
+
+       GList *list_md = NULL;
+       metadata_x *metadata = NULL;
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       list_md = info->app_info->metadata;
+
+       for (; list_md; list_md = list_md->next) {
+               metadata = (metadata_x *)list_md->data;
+               if (metadata && metadata->key) {
+                       if (strcasecmp(metadata->key, metadata_key) == 0) {
+                               if (metadata->value == NULL)
+                                       *metadata_value = "";
+                               else
+                                       *metadata_value = (char *)metadata->value;
+                               return PMINFO_R_OK;
+                       }
+               }
+       }
+
+       return PMINFO_R_EINVAL;
 }
 
 static pkgmgrinfo_app_component __appcomponent_convert(const char *comp)
 {
-       if ( strcasecmp(comp, "uiapp") == 0)
+       if (strcasecmp(comp, "uiapp") == 0)
                return PMINFO_UI_APP;
-       else if ( strcasecmp(comp, "svcapp") == 0)
+       else if (strcasecmp(comp, "svcapp") == 0)
                return PMINFO_SVC_APP;
+       else if (strcasecmp(comp, "widgetapp") == 0)
+               return PMINFO_WIDGET_APP;
+       else if (strcasecmp(comp, "watchapp") == 0)
+               return PMINFO_WATCH_APP;
        else
                return -1;
 }
 
+static const char *__appcomponent_str(pkgmgrinfo_app_component comp)
+{
+       switch (comp) {
+       case PMINFO_UI_APP:
+               return "uiapp";
+       case PMINFO_SVC_APP:
+               return "svcapp";
+       case PMINFO_WIDGET_APP:
+               return "widgetapp";
+       case PMINFO_WATCH_APP:
+               return "watchapp";
+       default:
+               return NULL;
+       }
+}
+
 API int pkgmgrinfo_appinfo_get_component(pkgmgrinfo_appinfo_h handle, pkgmgrinfo_app_component *component)
 {
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
@@ -1083,13 +1848,18 @@ API int pkgmgrinfo_appinfo_get_setting_icon(pkgmgrinfo_appinfo_h handle, char **
 {
        char *val;
        icon_x *ptr;
+       GList *tmp;
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL\n");
        retvm_if(icon == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL\n");
 
-       for (ptr = info->app_info->icon; ptr != NULL; ptr = ptr->next) {
-               if (ptr->section == NULL)
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       for (tmp = info->app_info->icon; tmp; tmp = tmp->next) {
+               ptr = (icon_x *)tmp->data;
+               if (ptr == NULL || ptr->section == NULL)
                        continue;
 
                val = (char *)ptr->section;
@@ -1107,17 +1877,22 @@ API int pkgmgrinfo_appinfo_get_notification_icon(pkgmgrinfo_appinfo_h handle, ch
 {
        char *val;
        icon_x *ptr;
+       GList *tmp;
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL\n");
        retvm_if(icon == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL\n");
 
-       for (ptr = info->app_info->icon; ptr != NULL; ptr = ptr->next) {
-               if (ptr->section == NULL)
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       for (tmp = info->app_info->icon; tmp; tmp = tmp->next) {
+               ptr = (icon_x *)tmp->data;
+               if (ptr == NULL || ptr->section == NULL)
                        continue;
 
                val = (char *)ptr->section;
-               if (val && strcmp(val, "notification") == 0){
+               if (val && strcmp(val, "notification") == 0) {
                        *icon = (char *)ptr->text;
                        return PMINFO_R_OK;
                }
@@ -1152,13 +1927,18 @@ API int pkgmgrinfo_appinfo_get_preview_image(pkgmgrinfo_appinfo_h handle, char *
 {
        char *val;
        image_x *ptr;
+       GList *tmp;
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL\n");
        retvm_if(preview_img == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL\n");
 
-       for (ptr = info->app_info->image; ptr != NULL; ptr = ptr->next) {
-               if (ptr->section == NULL)
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       for (tmp = info->app_info->image; tmp; tmp = tmp->next) {
+               ptr = (image_x *)tmp->data;
+               if (ptr == NULL || ptr->section == NULL)
                        continue;
 
                val = (char *)ptr->section;
@@ -1220,12 +2000,12 @@ API int pkgmgrinfo_appinfo_get_hwacceleration(pkgmgrinfo_appinfo_h handle, pkgmg
                return PMINFO_R_ERROR;
 
        val = (char *)info->app_info->hwacceleration;
-       if (strcasecmp(val, "not-use-GL") == 0)
-               *hwacceleration = PMINFO_HWACCELERATION_NOT_USE_GL;
-       else if (strcasecmp(val, "use-GL") == 0)
-               *hwacceleration = PMINFO_HWACCELERATION_USE_GL;
+       if (strcasecmp(val, "off") == 0)
+               *hwacceleration = PMINFO_HWACCELERATION_OFF;
+       else if (strcasecmp(val, "on") == 0)
+               *hwacceleration = PMINFO_HWACCELERATION_ON;
        else
-               *hwacceleration = PMINFO_HWACCELERATION_USE_SYSTEM_SETTING;
+               *hwacceleration = PMINFO_HWACCELERATION_DEFAULT;
 
        return PMINFO_R_OK;
 }
@@ -1260,12 +2040,35 @@ API int pkgmgrinfo_appinfo_get_effectimage(pkgmgrinfo_appinfo_h handle, char **p
        retvm_if(portrait_img == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
        retvm_if(landscape_img == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
 
-       if (info->app_info == NULL || info->app_info->portraitimg ||
-                       info->app_info->landscapeimg == NULL)
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       if (info->app_info->portraitimg == NULL)
+               *portrait_img = "";
+       else
+               *portrait_img = (char *)info->app_info->portraitimg;
+
+       if (info->app_info->landscapeimg == NULL)
+               *landscape_img = "";
+       else
+               *landscape_img = (char *)info->app_info->landscapeimg;
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_effectimage_type(pkgmgrinfo_appinfo_h handle, char **effectimage_type)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL || effectimage_type == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL || info->app_info->effectimage_type == NULL)
                return PMINFO_R_ERROR;
 
-       *portrait_img = (char *)info->app_info->portraitimg;
-       *landscape_img = (char *)info->app_info->landscapeimg;
+       *effectimage_type = (char *)info->app_info->effectimage_type;
 
        return PMINFO_R_OK;
 }
@@ -1277,10 +2080,32 @@ API int pkgmgrinfo_appinfo_get_submode_mainid(pkgmgrinfo_appinfo_h  handle, char
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
        retvm_if(submode_mainid == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
 
-       if (info->app_info == NULL || info->app_info->submode_mainid == NULL)
+       if (info->app_info == NULL)
                return PMINFO_R_ERROR;
 
-       *submode_mainid = (char *)info->app_info->submode_mainid;
+       if (info->app_info->submode_mainid == NULL)
+               *submode_mainid = "";
+       else
+               *submode_mainid = (char *)info->app_info->submode_mainid;
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_installed_storage_location(pkgmgrinfo_appinfo_h handle, pkgmgrinfo_installed_storage *storage)
+{
+       retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL\n");
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (info->app_info && info->app_info->installed_storage) {
+                if (strcmp(info->app_info->installed_storage, "installed_internal") == 0)
+                       *storage = PMINFO_INTERNAL_STORAGE;
+                else if (strcmp(info->app_info->installed_storage, "installed_external") == 0)
+                        *storage = PMINFO_EXTERNAL_STORAGE;
+                else
+                        return PMINFO_R_ERROR;
+       } else {
+               return PMINFO_R_ERROR;
+       }
 
        return PMINFO_R_OK;
 }
@@ -1300,7 +2125,136 @@ API int pkgmgrinfo_appinfo_get_launch_mode(pkgmgrinfo_appinfo_h handle, char **m
        return PMINFO_R_OK;
 }
 
-API int pkgmgrinfo_appinfo_usr_get_datacontrol_info(const char *providerid, const char *type, uid_t uid, char **appid, char **access)
+API int pkgmgrinfo_appinfo_get_alias_appid(pkgmgrinfo_appinfo_h handle, char **alias_appid)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL || alias_appid == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL || info->app_info->alias_appid == NULL)
+               return PMINFO_R_ERROR;
+
+       *alias_appid = (char *)info->app_info->alias_appid;
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_effective_appid(pkgmgrinfo_appinfo_h handle, char **effective_appid)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL || effective_appid == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       if (info->app_info->effective_appid == NULL)
+               *effective_appid = "";
+       else
+               *effective_appid = (char *)info->app_info->effective_appid;
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_tep_name(pkgmgrinfo_appinfo_h handle, char **tep_name)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL || tep_name == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       if (info->app_info->tep_name == NULL)
+               *tep_name = "";
+       else
+               *tep_name = (char *)info->app_info->tep_name;
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_zip_mount_file(pkgmgrinfo_appinfo_h handle, char **zip_mount_file)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL || zip_mount_file == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       if (info->app_info->zip_mount_file == NULL)
+               *zip_mount_file = "";
+       else
+               *zip_mount_file = (char *)info->app_info->zip_mount_file;
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_root_path(pkgmgrinfo_appinfo_h handle, char **root_path)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL || root_path == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL || info->app_info->root_path == NULL)
+               return PMINFO_R_ERROR;
+
+       *root_path = (char *)info->app_info->root_path;
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_api_version(pkgmgrinfo_appinfo_h handle, char **api_version)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL || api_version == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL || info->app_info->api_version == NULL)
+               return PMINFO_R_ERROR;
+
+       *api_version = (char *)info->app_info->api_version;
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_installed_time(pkgmgrinfo_appinfo_h handle, int *installed_time)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL || installed_time == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL || info->app_info->package_installed_time == NULL)
+               return PMINFO_R_ERROR;
+
+       *installed_time = atoi(info->app_info->package_installed_time);
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_usr_get_datacontrol_info(const char *providerid,
+               const char *type, uid_t uid, char **appid, char **access)
 {
        retvm_if(providerid == NULL, PMINFO_R_EINVAL, "Argument supplied is NULL\n");
        retvm_if(type == NULL, PMINFO_R_EINVAL, "Argument supplied is NULL\n");
@@ -1312,11 +2266,12 @@ API int pkgmgrinfo_appinfo_usr_get_datacontrol_info(const char *providerid, cons
        sqlite3_stmt *stmt = NULL;
 
        /*open db*/
-       ret = __open_manifest_db(uid);
+       ret = __open_manifest_db(uid, true);
        retvm_if(ret != SQLITE_OK, ret = PMINFO_R_ERROR, "connect db [%s] failed!", MANIFEST_DB);
 
        /*Start constructing query*/
        query = sqlite3_mprintf("select * from package_app_data_control where providerid=%Q and type=%Q", providerid, type);
+       tryvm_if(query == NULL, ret = PMINFO_R_ERROR, "Out of memory");
 
        /*prepare query*/
        ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query), &stmt, NULL);
@@ -1338,9 +2293,11 @@ catch:
        return ret;
 }
 
-API int pkgmgrinfo_appinfo_get_datacontrol_info(const char *providerid, const char *type, char **appid, char **access)
+API int pkgmgrinfo_appinfo_get_datacontrol_info(const char *providerid,
+               const char *type, char **appid, char **access)
 {
-       return pkgmgrinfo_appinfo_usr_get_datacontrol_info(providerid, type, GLOBAL_USER, appid, access);
+       return pkgmgrinfo_appinfo_usr_get_datacontrol_info(providerid,
+                       type, _getuid(), appid, access);
 }
 
 API int pkgmgrinfo_appinfo_usr_get_datacontrol_appid(const char *providerid, uid_t uid, char **appid)
@@ -1353,11 +2310,12 @@ API int pkgmgrinfo_appinfo_usr_get_datacontrol_appid(const char *providerid, uid
        sqlite3_stmt *stmt = NULL;
 
        /*open db*/
-       ret = __open_manifest_db(uid);
+       ret = __open_manifest_db(uid, true);
        retvm_if(ret != SQLITE_OK, ret = PMINFO_R_ERROR, "connect db [%s] failed!", MANIFEST_DB);
 
        /*Start constructing query*/
        query = sqlite3_mprintf("select * from package_app_data_control where providerid=%Q", providerid);
+       tryvm_if(query == NULL, ret = PMINFO_R_ERROR, "Out of memory");
 
        /*prepare query*/
        ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query), &stmt, NULL);
@@ -1380,7 +2338,67 @@ catch:
 
 API int pkgmgrinfo_appinfo_get_datacontrol_appid(const char *providerid, char **appid)
 {
-       return pkgmgrinfo_appinfo_usr_get_datacontrol_appid(providerid, GLOBAL_USER, appid);
+       return pkgmgrinfo_appinfo_usr_get_datacontrol_appid(providerid, _getuid(), appid);
+}
+
+API int pkgmgrinfo_appinfo_usr_get_datacontrol_trusted_info(const char *providerid,
+               const char *type, uid_t uid, char **appid, bool *is_trusted)
+{
+       retvm_if(providerid == NULL, PMINFO_R_EINVAL, "Argument supplied is NULL\n");
+       retvm_if(appid == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL\n");
+
+       int ret = PMINFO_R_OK;
+       char *query = NULL;
+       sqlite3_stmt *stmt = NULL;
+
+       /*open db*/
+       ret = __open_manifest_db(uid, true);
+       retvm_if(ret != SQLITE_OK, ret = PMINFO_R_ERROR, "connect db [%s] failed!", MANIFEST_DB);
+
+       /*Start constructing query*/
+       query = sqlite3_mprintf("SELECT app_id, trusted FROM package_app_data_control WHERE providerid=%Q AND type=%Q", providerid, type);
+       tryvm_if(query == NULL, ret = PMINFO_R_ERROR, "Out of memory");
+
+       /*prepare query*/
+       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query), &stmt, NULL);
+       tryvm_if(ret != PMINFO_R_OK, ret = PMINFO_R_ERROR, "sqlite3_prepare_v2 failed[%s]\n", query);
+
+       /*step query*/
+       ret = sqlite3_step(stmt);
+       tryvm_if((ret != SQLITE_ROW) || (ret == SQLITE_DONE), ret = PMINFO_R_ERROR, "No records found");
+
+       _save_column_str(stmt, 0, appid);
+       *is_trusted = _get_bool_value((char *)sqlite3_column_text(stmt, 1));
+
+       ret = PMINFO_R_OK;
+
+catch:
+       sqlite3_free(query);
+       sqlite3_finalize(stmt);
+       __close_manifest_db();
+       return ret;
+}
+
+API int pkgmgrinfo_appinfo_get_datacontrol_trsuted_info(const char *providerid,
+               const char *type, char **appid, bool *is_trusted)
+{
+       return pkgmgrinfo_appinfo_usr_get_datacontrol_trusted_info(providerid,
+                       type, _getuid(), appid, is_trusted);
+}
+
+
+API int pkgmgrinfo_appinfo_get_support_mode(pkgmgrinfo_appinfo_h  handle, int *support_mode)
+{
+       retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
+       retvm_if(support_mode == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
+
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+       if (info->app_info->support_mode)
+               *support_mode = atoi(info->app_info->support_mode);
+       else
+               *support_mode = 0;
+
+       return PMINFO_R_OK;
 }
 
 API int pkgmgrinfo_appinfo_foreach_permission(pkgmgrinfo_appinfo_h handle,
@@ -1389,13 +2407,17 @@ API int pkgmgrinfo_appinfo_foreach_permission(pkgmgrinfo_appinfo_h handle,
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
        retvm_if(permission_func == NULL, PMINFO_R_EINVAL, "Callback function is NULL");
        int ret = -1;
-       permission_x *ptr = NULL;
+       permission_x *ptr;
+       GList *tmp;
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
        if (info->app_info == NULL)
                return PMINFO_R_ERROR;
 
-       for (ptr = info->app_info->permission; ptr; ptr = ptr->next) {
+       for (tmp = info->app_info->permission; tmp; tmp = tmp->next) {
+               ptr = (permission_x *)tmp->data;
+               if (ptr == NULL)
+                       continue;
                if (ptr->value) {
                        ret = permission_func(ptr->value, user_data);
                        if (ret < 0)
@@ -1411,15 +2433,17 @@ API int pkgmgrinfo_appinfo_foreach_category(pkgmgrinfo_appinfo_h handle,
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
        retvm_if(category_func == NULL, PMINFO_R_EINVAL, "Callback function is NULL");
        int ret = -1;
-       category_x *ptr = NULL;
+       const char *category;
+       GList *tmp;
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
        if (info->app_info == NULL)
                return PMINFO_R_ERROR;
 
-       for (ptr = info->app_info->category; ptr; ptr = ptr->next) {
-               if (ptr->name) {
-                       ret = category_func(ptr->name, user_data);
+       for (tmp = info->app_info->category; tmp; tmp = tmp->next) {
+               category = (const char *)tmp->data;
+               if (category) {
+                       ret = category_func(category, user_data);
                        if (ret < 0)
                                break;
                }
@@ -1433,36 +2457,103 @@ API int pkgmgrinfo_appinfo_foreach_metadata(pkgmgrinfo_appinfo_h handle,
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
        retvm_if(metadata_func == NULL, PMINFO_R_EINVAL, "Callback function is NULL");
        int ret = -1;
-       metadata_x *ptr = NULL;
+       metadata_x *ptr;
+       GList *tmp;
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       for (tmp = info->app_info->metadata; tmp; tmp = tmp->next) {
+               ptr = (metadata_x *)tmp->data;
+               if (ptr == NULL)
+                       continue;
+               if (ptr->key) {
+                       ret = metadata_func(ptr->key, ptr->value ? ptr->value : "", user_data);
+                       if (ret < 0)
+                               break;
+               }
+       }
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_foreach_appcontrol(pkgmgrinfo_appinfo_h handle,
+                       pkgmgrinfo_app_control_list_cb appcontrol_func, void *user_data)
+{
+       retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
+       retvm_if(appcontrol_func == NULL, PMINFO_R_EINVAL, "Callback function is NULL");
+       int ret;
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+       appcontrol_x *appcontrol;
+       GList *tmp;
+
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       for (tmp = info->app_info->appcontrol; tmp; tmp = tmp->next) {
+               appcontrol = (appcontrol_x *)tmp->data;
+               if (appcontrol == NULL)
+                       continue;
+               ret = appcontrol_func(appcontrol->operation, appcontrol->uri, appcontrol->mime, user_data);
+               if (ret < 0)
+                       break;
+       }
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_foreach_background_category(
+               pkgmgrinfo_appinfo_h handle,
+               pkgmgrinfo_app_background_category_list_cb category_func,
+               void *user_data)
+{
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+       GList *tmp;
+       char *category;
+
+       if (handle == NULL || category_func == NULL || info->app_info == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
 
-       if (info->app_info == NULL)
-               return PMINFO_R_ERROR;
+       for (tmp = info->app_info->background_category; tmp; tmp = tmp->next) {
+               category = (char *)tmp->data;
+               if (category == NULL)
+                       continue;
 
-       for (ptr = info->app_info->metadata; ptr; ptr = ptr->next) {
-               if (ptr->key) {
-                       ret = metadata_func(ptr->key, ptr->value, user_data);
-                       if (ret < 0)
-                               break;
-               }
+               if (category_func(category, user_data) < 0)
+                       break;
        }
+
        return PMINFO_R_OK;
 }
 
-API int pkgmgrinfo_appinfo_foreach_appcontrol(pkgmgrinfo_appinfo_h handle,
-                       pkgmgrinfo_app_control_list_cb appcontrol_func, void *user_data)
+API int pkgmgrinfo_appinfo_foreach_splash_screen(pkgmgrinfo_appinfo_h handle,
+               pkgmgrinfo_app_splash_screen_list_cb splash_screen_func,
+               void *user_data)
 {
-       retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
-       retvm_if(appcontrol_func == NULL, PMINFO_R_EINVAL, "Callback function is NULL");
-       int ret;
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
-       appcontrol_x *appcontrol;
+       splashscreen_x *splashscreen;
+       GList *tmp;
+       int ret;
 
-       if (info->uiapp_info == NULL)
-               return PMINFO_R_ERROR;
+       if (info == NULL || info->app_info == NULL
+                       || splash_screen_func == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
 
-       for (appcontrol = info->app_info->appcontrol; appcontrol; appcontrol = appcontrol->next) {
-               ret = appcontrol_func(appcontrol->operation, appcontrol->uri, appcontrol->mime, user_data);
+       for (tmp = info->app_info->splashscreens; tmp; tmp = tmp->next) {
+               splashscreen = (splashscreen_x *)tmp->data;
+               if (splashscreen == NULL)
+                       continue;
+               ret = splash_screen_func(splashscreen->src,
+                               splashscreen->type,
+                               splashscreen->orientation,
+                               splashscreen->indicatordisplay,
+                               splashscreen->operation,
+                               splashscreen->color_depth,
+                               user_data);
                if (ret < 0)
                        break;
        }
@@ -1476,10 +2567,11 @@ API int pkgmgrinfo_appinfo_is_nodisplay(pkgmgrinfo_appinfo_h handle, bool *nodis
        retvm_if(nodisplay == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->nodisplay == NULL)
                return PMINFO_R_ERROR;
 
        *nodisplay = _get_bool_value(info->app_info->nodisplay);
+
        return PMINFO_R_OK;
 }
 
@@ -1489,10 +2581,11 @@ API int pkgmgrinfo_appinfo_is_multiple(pkgmgrinfo_appinfo_h handle, bool *multip
        retvm_if(multiple == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->multiple == NULL)
                return PMINFO_R_ERROR;
 
        *multiple = _get_bool_value(info->app_info->multiple);
+
        return PMINFO_R_OK;
 }
 
@@ -1502,10 +2595,11 @@ API int pkgmgrinfo_appinfo_is_indicator_display_allowed(pkgmgrinfo_appinfo_h han
        retvm_if(indicator_disp == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->indicatordisplay == NULL)
                return PMINFO_R_ERROR;
 
        *indicator_disp = _get_bool_value(info->app_info->indicatordisplay);
+
        return PMINFO_R_OK;
 }
 
@@ -1515,10 +2609,11 @@ API int pkgmgrinfo_appinfo_is_taskmanage(pkgmgrinfo_appinfo_h  handle, bool *tas
        retvm_if(taskmanage == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->taskmanage == NULL)
                return PMINFO_R_ERROR;
 
        *taskmanage = _get_bool_value(info->app_info->taskmanage);
+
        return PMINFO_R_OK;
 }
 
@@ -1528,12 +2623,12 @@ API int pkgmgrinfo_appinfo_is_enabled(pkgmgrinfo_appinfo_h  handle, bool *enable
        retvm_if(enabled == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->is_disabled == NULL)
                return PMINFO_R_ERROR;
 
-       *enabled = _get_bool_value(info->app_info->enabled);
-       return PMINFO_R_OK;
+       *enabled = !_get_bool_value(info->app_info->is_disabled);
 
+       return PMINFO_R_OK;
 }
 
 API int pkgmgrinfo_appinfo_is_onboot(pkgmgrinfo_appinfo_h  handle, bool *onboot)
@@ -1542,10 +2637,11 @@ API int pkgmgrinfo_appinfo_is_onboot(pkgmgrinfo_appinfo_h  handle, bool *onboot)
        retvm_if(onboot == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->onboot == NULL)
                return PMINFO_R_ERROR;
 
        *onboot = _get_bool_value(info->app_info->onboot);
+
        return PMINFO_R_OK;
 }
 
@@ -1555,10 +2651,11 @@ API int pkgmgrinfo_appinfo_is_autorestart(pkgmgrinfo_appinfo_h  handle, bool *au
        retvm_if(autorestart == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->autorestart == NULL)
                return PMINFO_R_ERROR;
 
        *autorestart = _get_bool_value(info->app_info->autorestart);
+
        return PMINFO_R_OK;
 }
 
@@ -1568,10 +2665,11 @@ API int pkgmgrinfo_appinfo_is_mainapp(pkgmgrinfo_appinfo_h  handle, bool *mainap
        retvm_if(mainapp == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->mainapp == NULL)
                return PMINFO_R_ERROR;
 
        *mainapp = _get_bool_value(info->app_info->mainapp);
+
        return PMINFO_R_OK;
 }
 
@@ -1581,10 +2679,11 @@ API int pkgmgrinfo_appinfo_is_preload(pkgmgrinfo_appinfo_h handle, bool *preload
        retvm_if(preload == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL\n");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->preload == NULL)
                return PMINFO_R_ERROR;
 
        *preload = _get_bool_value(info->app_info->preload);
+
        return PMINFO_R_OK;
 }
 
@@ -1594,10 +2693,28 @@ API int pkgmgrinfo_appinfo_is_submode(pkgmgrinfo_appinfo_h handle, bool *submode
        retvm_if(submode == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL\n");
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
-       if (info->app_info == NULL)
+       if (info->app_info == NULL || info->app_info->submode == NULL)
                return PMINFO_R_ERROR;
 
        *submode = _get_bool_value(info->app_info->submode);
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_is_process_pool(pkgmgrinfo_appinfo_h handle, bool *process_pool)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (handle == NULL || process_pool == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL)
+               return PMINFO_R_ERROR;
+
+       *process_pool = _get_bool_value(info->app_info->process_pool);
+
        return PMINFO_R_OK;
 }
 
@@ -1607,19 +2724,21 @@ API int pkgmgrinfo_appinfo_is_category_exist(pkgmgrinfo_appinfo_h handle, const
        retvm_if(category == NULL, PMINFO_R_EINVAL, "category is NULL");
        retvm_if(exist == NULL, PMINFO_R_EINVAL, "exist is NULL");
 
-       category_x *ptr = NULL;
+       const char *val;
+       GList *tmp;
        pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
 
        if (info->app_info == NULL)
                return PMINFO_R_ERROR;
 
        *exist = 0;
-       for (ptr = info->app_info->category; ptr; ptr = ptr->next) {
-               if (ptr->name) {
-                       if (strcasecmp(ptr->name, category) == 0) {
-                               *exist = 1;
-                               break;
-                       }
+       for (tmp = info->app_info->category; tmp; tmp = tmp->next) {
+               val = (const char *)tmp->data;
+               if (val == NULL)
+                       continue;
+               if (strcasecmp(val, category) == 0) {
+                       *exist = 1;
+                       break;
                }
        }
 
@@ -1635,12 +2754,138 @@ API int pkgmgrinfo_appinfo_is_ui_gadget(pkgmgrinfo_appinfo_h handle,
                _LOGE("invalid parameter");
                return PMINFO_R_EINVAL;
        }
+       if (info->app_info->ui_gadget == NULL)
+               info->app_info->ui_gadget = strdup("false");
 
        *ui_gadget = _get_bool_value(info->app_info->ui_gadget);
 
        return PMINFO_R_OK;
 }
 
+API int pkgmgrinfo_appinfo_is_support_disable(pkgmgrinfo_appinfo_h handle,
+               bool *support_disable)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (info == NULL || info->app_info == NULL || support_disable == NULL) {
+               _LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       *support_disable = _get_bool_value(info->app_info->support_disable);
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_is_removable(pkgmgrinfo_appinfo_h handle,
+               bool *removable)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (info == NULL || info->app_info == NULL || removable == NULL) {
+               _LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       *removable = _get_bool_value(info->app_info->removable);
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_is_system(pkgmgrinfo_appinfo_h handle, bool *system)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (info == NULL || info->app_info == NULL || system == NULL) {
+               _LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       *system = _get_bool_value(info->app_info->package_system);
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_is_disabled(pkgmgrinfo_appinfo_h handle, bool *disabled)
+{
+       retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
+       retvm_if(disabled == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL");
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (info->app_info == NULL || info->app_info->is_disabled == NULL)
+               return PMINFO_R_ERROR;
+
+       *disabled = _get_bool_value(info->app_info->is_disabled);
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_is_global(pkgmgrinfo_appinfo_h handle, bool *global)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL\n");
+       retvm_if(global == NULL, PMINFO_R_EINVAL, "Argument supplied to hold return value is NULL\n");
+
+       if (info->app_info == NULL || info->app_info->for_all_users == NULL)
+               return PMINFO_R_ERROR;
+
+       *global = _get_bool_value(info->app_info->for_all_users);
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_splash_screen_display(pkgmgrinfo_appinfo_h handle, bool *splash_screen_display)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (info == NULL || splash_screen_display == NULL) {
+               _LOGE("Invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL || info->app_info->splash_screen_display == NULL)
+               return PMINFO_R_ERROR;
+
+       *splash_screen_display = _get_bool_value(info->app_info->splash_screen_display);
+
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_get_setup_appid(pkgmgrinfo_appinfo_h handle, char **setup_appid)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (info == NULL || setup_appid == NULL) {
+               _LOGE("Invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL || info->app_info->setup_appid == NULL)
+               return PMINFO_R_ERROR;
+
+       *setup_appid = info->app_info->setup_appid;
+       return PMINFO_R_OK;
+}
+
+API int pkgmgrinfo_appinfo_is_support_ambient(pkgmgrinfo_appinfo_h handle,
+               bool *support_ambient)
+{
+       pkgmgr_appinfo_x *info = (pkgmgr_appinfo_x *)handle;
+
+       if (info == NULL || support_ambient == NULL) {
+               _LOGE("Invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
+
+       if (info->app_info == NULL || info->app_info->support_ambient == NULL)
+               return PMINFO_R_ERROR;
+
+       *support_ambient = _get_bool_value(info->app_info->support_ambient);
+
+       return PMINFO_R_OK;
+}
+
 API int pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo_h handle)
 {
        retvm_if(handle == NULL, PMINFO_R_EINVAL, "appinfo handle is NULL");
@@ -1661,8 +2906,8 @@ API int pkgmgrinfo_appinfo_filter_destroy(pkgmgrinfo_appinfo_filter_h handle)
 
 static gint __compare_func(gconstpointer data1, gconstpointer data2)
 {
-       pkgmgrinfo_node_x *node1 = (pkgmgrinfo_node_x*)data1;
-       pkgmgrinfo_node_x *node2 = (pkgmgrinfo_node_x*)data2;
+       pkgmgrinfo_node_x *node1 = (pkgmgrinfo_node_x *)data1;
+       pkgmgrinfo_node_x *node2 = (pkgmgrinfo_node_x *)data2;
        if (node1->prop == node2->prop)
                return 0;
        else if (node1->prop > node2->prop)
@@ -1686,8 +2931,8 @@ API int pkgmgrinfo_appinfo_filter_add_int(pkgmgrinfo_appinfo_filter_h handle,
                _LOGE("Invalid Integer Property\n");
                return PMINFO_R_EINVAL;
        }
-       pkgmgrinfo_filter_x *filter = (pkgmgrinfo_filter_x*)handle;
-       pkgmgrinfo_node_x *node = (pkgmgrinfo_node_x*)calloc(1, sizeof(pkgmgrinfo_node_x));
+       pkgmgrinfo_filter_x *filter = (pkgmgrinfo_filter_x *)handle;
+       pkgmgrinfo_node_x *node = (pkgmgrinfo_node_x *)calloc(1, sizeof(pkgmgrinfo_node_x));
        if (node == NULL) {
                _LOGE("Out of Memory!!!\n");
                return PMINFO_R_ERROR;
@@ -1726,16 +2971,16 @@ API int pkgmgrinfo_appinfo_filter_add_bool(pkgmgrinfo_appinfo_filter_h handle,
                _LOGE("Invalid Boolean Property\n");
                return PMINFO_R_EINVAL;
        }
-       pkgmgrinfo_filter_x *filter = (pkgmgrinfo_filter_x*)handle;
-       pkgmgrinfo_node_x *node = (pkgmgrinfo_node_x*)calloc(1, sizeof(pkgmgrinfo_node_x));
+       pkgmgrinfo_filter_x *filter = (pkgmgrinfo_filter_x *)handle;
+       pkgmgrinfo_node_x *node = (pkgmgrinfo_node_x *)calloc(1, sizeof(pkgmgrinfo_node_x));
        if (node == NULL) {
                _LOGE("Out of Memory!!!\n");
                return PMINFO_R_ERROR;
        }
        if (value)
-               val = strndup("('true','True')", 15);
+               val = strndup("true", 4);
        else
-               val = strndup("('false','False')", 17);
+               val = strndup("false", 5);
        if (val == NULL) {
                _LOGE("Out of Memory\n");
                free(node);
@@ -1772,8 +3017,8 @@ API int pkgmgrinfo_appinfo_filter_add_string(pkgmgrinfo_appinfo_filter_h handle,
                _LOGE("Invalid String Property\n");
                return PMINFO_R_EINVAL;
        }
-       pkgmgrinfo_filter_x *filter = (pkgmgrinfo_filter_x*)handle;
-       pkgmgrinfo_node_x *node = (pkgmgrinfo_node_x*)calloc(1, sizeof(pkgmgrinfo_node_x));
+       pkgmgrinfo_filter_x *filter = (pkgmgrinfo_filter_x *)handle;
+       pkgmgrinfo_node_x *node = (pkgmgrinfo_node_x *)calloc(1, sizeof(pkgmgrinfo_node_x));
        if (node == NULL) {
                _LOGE("Out of Memory!!!\n");
                return PMINFO_R_ERROR;
@@ -1781,20 +3026,13 @@ API int pkgmgrinfo_appinfo_filter_add_string(pkgmgrinfo_appinfo_filter_h handle,
        node->prop = prop;
        switch (prop) {
        case E_PMINFO_APPINFO_PROP_APP_COMPONENT:
-               if (strcmp(value, PMINFO_APPINFO_UI_APP) == 0)
-                       val = strndup("uiapp", PKG_STRING_LEN_MAX - 1);
-               else
-                       val = strndup("svcapp", PKG_STRING_LEN_MAX - 1);
-               node->value = val;
+               node->value = strdup(value);
                link = g_slist_find_custom(filter->list, (gconstpointer)node, __compare_func);
                if (link)
                        filter->list = g_slist_delete_link(filter->list, link);
                filter->list = g_slist_append(filter->list, (gpointer)node);
                break;
        case E_PMINFO_APPINFO_PROP_APP_CATEGORY:
-       case E_PMINFO_APPINFO_PROP_APP_OPERATION:
-       case E_PMINFO_APPINFO_PROP_APP_URI:
-       case E_PMINFO_APPINFO_PROP_APP_MIME:
                val = (char *)calloc(1, PKG_STRING_LEN_MAX);
                if (val == NULL) {
                        _LOGE("Out of Memory\n");
@@ -1806,18 +3044,18 @@ API int pkgmgrinfo_appinfo_filter_add_string(pkgmgrinfo_appinfo_filter_h handle,
                if (link) {
                        ptr = (pkgmgrinfo_node_x *)link->data;
                        strncpy(prev, ptr->value, PKG_STRING_LEN_MAX - 1);
-                       _LOGE("Previous value is %s\n", prev);
+                       _LOGI("Previous value is %s\n", prev);
                        filter->list = g_slist_delete_link(filter->list, link);
-                       snprintf(temp, PKG_STRING_LEN_MAX - 1, "%s , '%s'", prev, value);
+                       snprintf(temp, PKG_STRING_LEN_MAX - 1, "%s,%s", prev, value);
                        strncpy(val, temp, PKG_STRING_LEN_MAX - 1);
-                       _LOGE("New value is %s\n", val);
+                       _LOGI("New value is %s\n", val);
                        node->value = val;
                        filter->list = g_slist_append(filter->list, (gpointer)node);
                        memset(temp, '\0', PKG_STRING_LEN_MAX);
                } else {
-                       snprintf(temp, PKG_STRING_LEN_MAX - 1, "'%s'", value);
+                       snprintf(temp, PKG_STRING_LEN_MAX - 1, "%s", value);
                        strncpy(val, temp, PKG_STRING_LEN_MAX - 1);
-                       _LOGE("First value is %s\n", val);
+                       _LOGI("First value is %s\n", val);
                        node->value = val;
                        filter->list = g_slist_append(filter->list, (gpointer)node);
                        memset(temp, '\0', PKG_STRING_LEN_MAX);
@@ -1834,86 +3072,49 @@ API int pkgmgrinfo_appinfo_filter_add_string(pkgmgrinfo_appinfo_filter_h handle,
        return PMINFO_R_OK;
 }
 
-static int __count_cb(void *data, int ncols, char **coltxt, char **colname)
-{
-       int *p = (int*)data;
-       *p = atoi(coltxt[0]);
-       _LOGE("count value is %d\n", *p);
-       return 0;
-}
-
 API int pkgmgrinfo_appinfo_usr_filter_count(pkgmgrinfo_appinfo_filter_h handle, int *count, uid_t uid)
 {
-       retvm_if(handle == NULL, PMINFO_R_EINVAL, "Filter handle input parameter is NULL\n");
-       retvm_if(count == NULL, PMINFO_R_EINVAL, "Filter handle input parameter is NULL\n");
-       char *locale = NULL;
-       char *condition = NULL;
-       char *error_message = NULL;
-       char query[MAX_QUERY_LEN] = {'\0'};
-       char where[MAX_QUERY_LEN] = {'\0'};
-       GSList *list;
-       int ret = 0;
+       int ret;
+       char *locale;
+       GHashTable *list;
+
+       if (handle == NULL || count == NULL) {
+               _LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
+       }
 
-       pkgmgrinfo_filter_x *filter = (pkgmgrinfo_filter_x*)handle;
-       /*Get current locale*/
        locale = _get_system_locale();
-       if (locale == NULL) {
-               _LOGE("manifest locale is NULL\n");
+       if (locale == NULL)
                return PMINFO_R_ERROR;
-       }
 
-       ret = __open_manifest_db(uid);
-       if (ret == -1) {
-               _LOGE("Fail to open manifest DB\n");
+       list = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
+                       __free_applications);
+       if (list == NULL) {
                free(locale);
                return PMINFO_R_ERROR;
        }
 
-       /*Start constructing query*/
-       snprintf(query, MAX_QUERY_LEN - 1, FILTER_QUERY_COUNT_APP, locale);
-
-       /*Get where clause*/
-       for (list = filter->list; list; list = g_slist_next(list)) {
-               __get_filter_condition(list->data, &condition);
-               if (condition) {
-                       strncat(where, condition, sizeof(where) - strlen(where) -1);
-                       where[sizeof(where) - 1] = '\0';
-                       free(condition);
-                       condition = NULL;
-               }
-               if (g_slist_next(list)) {
-                       strncat(where, " and ", sizeof(where) - strlen(where) - 1);
-                       where[sizeof(where) - 1] = '\0';
-               }
-       }
-       if (strlen(where) > 0) {
-               strncat(query, where, sizeof(query) - strlen(query) - 1);
-               query[sizeof(query) - 1] = '\0';
-       }
+       ret = _appinfo_get_applications(uid, uid, locale, handle, 0, list);
+       if (ret == PMINFO_R_OK && uid != GLOBAL_USER)
+               ret = _appinfo_get_applications(GLOBAL_USER, uid, locale,
+                               handle, 0, list);
 
-       /*Execute Query*/
-       if (SQLITE_OK !=
-           sqlite3_exec(GET_DB(manifest_db), query, __count_cb, (void *)count, &error_message)) {
-               _LOGE("Don't execute query = %s error message = %s\n", query,
-                      error_message);
-               sqlite3_free(error_message);
-               ret = PMINFO_R_ERROR;
-               *count = 0;
-               goto err;
-       }
-       ret = PMINFO_R_OK;
-err:
-       if (locale) {
+       if (ret != PMINFO_R_OK) {
+               g_hash_table_destroy(list);
                free(locale);
-               locale = NULL;
+               return PMINFO_R_ERROR;
        }
-       __close_manifest_db();
-       return ret;
+
+       *count = g_hash_table_size(list);
+       g_hash_table_destroy(list);
+       free(locale);
+
+       return PMINFO_R_OK;
 }
 
 API int pkgmgrinfo_appinfo_filter_count(pkgmgrinfo_appinfo_filter_h handle, int *count)
 {
-       return pkgmgrinfo_appinfo_usr_filter_count(handle, count, GLOBAL_USER);
+       return pkgmgrinfo_appinfo_usr_filter_count(handle, count, _getuid());
 }
 
 API int pkgmgrinfo_appinfo_usr_filter_foreach_appinfo(
@@ -1925,14 +3126,14 @@ API int pkgmgrinfo_appinfo_usr_filter_foreach_appinfo(
                return PMINFO_R_EINVAL;
        }
 
-       return _appinfo_get_filtered_foreach_appinfo(uid, handle, app_cb,
+       return _appinfo_get_filtered_foreach_appinfo(uid, handle, PMINFO_APPINFO_GET_ALL, app_cb,
                        user_data);
 }
 
 API int pkgmgrinfo_appinfo_filter_foreach_appinfo(pkgmgrinfo_appinfo_filter_h handle,
-                               pkgmgrinfo_app_list_cb app_cb, void * user_data)
+                               pkgmgrinfo_app_list_cb app_cb, void *user_data)
 {
-       return pkgmgrinfo_appinfo_usr_filter_foreach_appinfo(handle, app_cb, user_data, GLOBAL_USER);
+       return pkgmgrinfo_appinfo_usr_filter_foreach_appinfo(handle, app_cb, user_data, _getuid());
 }
 
 API int pkgmgrinfo_appinfo_metadata_filter_create(pkgmgrinfo_appinfo_metadata_filter_h *handle)
@@ -1945,183 +3146,56 @@ API int pkgmgrinfo_appinfo_metadata_filter_destroy(pkgmgrinfo_appinfo_metadata_f
        return (pkgmgrinfo_pkginfo_filter_destroy(handle));
 }
 
-API int pkgmgrinfo_appinfo_metadata_filter_add(pkgmgrinfo_appinfo_metadata_filter_h handle,
+API int pkgmgrinfo_appinfo_metadata_filter_add(
+               pkgmgrinfo_appinfo_metadata_filter_h handle,
                const char *key, const char *value)
 {
-       retvm_if(handle == NULL, PMINFO_R_EINVAL, "filter handle is NULL\n");
-       retvm_if(key == NULL, PMINFO_R_EINVAL, "metadata key supplied is NULL\n");
-       /*value can be NULL. In that case all apps with specified key should be displayed*/
-       int ret = 0;
-       char *k = NULL;
-       char *v = NULL;
-       pkgmgrinfo_filter_x *filter = (pkgmgrinfo_filter_x*)handle;
-       pkgmgrinfo_node_x *node = (pkgmgrinfo_node_x*)calloc(1, sizeof(pkgmgrinfo_node_x));
-       retvm_if(node == NULL, PMINFO_R_ERROR, "Out of Memory!!!\n");
-       k = strdup(key);
-       tryvm_if(k == NULL, ret = PMINFO_R_ERROR, "Out of Memory!!!\n");
-       node->key = k;
-       if (value) {
-               v = strdup(value);
-               tryvm_if(v == NULL, ret = PMINFO_R_ERROR, "Out of Memory!!!\n");
-       }
-       node->value = v;
-       /*If API is called multiple times, we should OR all conditions.*/
-       filter->list = g_slist_append(filter->list, (gpointer)node);
-       /*All memory will be freed in destroy API*/
-       return PMINFO_R_OK;
-catch:
-       if (node) {
-               if (node->key) {
-                       free(node->key);
-                       node->key = NULL;
-               }
-               if (node->value) {
-                       free(node->value);
-                       node->value = NULL;
-               }
-               free(node);
-               node = NULL;
-       }
-       return ret;
-}
-
-static void __get_metadata_filter_condition(gpointer data, char **condition)
-{
-       pkgmgrinfo_node_x *node = (pkgmgrinfo_node_x*)data;
-       char key[MAX_QUERY_LEN] = {'\0'};
-       char value[MAX_QUERY_LEN] = {'\0'};
-       if (node->key) {
-               snprintf(key, MAX_QUERY_LEN, "(package_app_app_metadata.md_key='%s'", node->key);
-       }
-       if (node->value) {
-               snprintf(value, MAX_QUERY_LEN, " AND package_app_app_metadata.md_value='%s')", node->value);
-               strcat(key, value);
-       } else {
-               strcat(key, ")");
-       }
-       *condition = strdup(key);
-       return;
-}
-
-static char *_get_metadata_filtered_query(const char *query_raw,
-               pkgmgrinfo_filter_x *filter)
-{
-       char buf[MAX_QUERY_LEN] = { 0, };
-       char *condition;
-       size_t len;
-       GSList *list;
-       GSList *head = NULL;
-
-       if (filter)
-               head = filter->list;
+       pkgmgrinfo_filter_x *filter = (pkgmgrinfo_filter_x *)handle;
+       pkgmgrinfo_metadata_node_x *node;
 
-       strncat(buf, query_raw, MAX_QUERY_LEN - 1);
-       len = strlen(buf);
-       for (list = head; list; list = list->next) {
-               /* TODO: revise condition getter function */
-               __get_metadata_filter_condition(list->data, &condition);
-               if (condition == NULL)
-                       continue;
-               if (buf[strlen(query_raw)] == '\0') {
-                       len += strlen(" WHERE ");
-                       strncat(buf, " WHERE ", MAX_QUERY_LEN - len - 1);
-               } else {
-                       len += strlen(" AND ");
-                       strncat(buf, " AND ", MAX_QUERY_LEN -len - 1);
-               }
-               len += strlen(condition);
-               strncat(buf, condition, sizeof(buf) - len - 1);
-               free(condition);
-               condition = NULL;
+       /* value can be NULL.
+        * In that case all apps with specified key should be displayed
+        */
+       if (key == NULL) {
+               LOGE("invalid parameter");
+               return PMINFO_R_EINVAL;
        }
 
-       return strdup(buf);
-}
-
-static GSList *_appinfo_get_metadata_filtered_list(pkgmgrinfo_filter_x *filter)
-{
-       static const char query_raw[] =
-               "SELECT app_id FROM package_app_app_metadata";
-       int ret;
-       char *query;
-       sqlite3_stmt *stmt;
-       GSList *list = NULL;
-       char *appid;
-
-       query = _get_metadata_filtered_query(query_raw, filter);
-       if (query == NULL) {
+       node = calloc(1, sizeof(pkgmgrinfo_metadata_node_x));
+       if (node == NULL) {
                LOGE("out of memory");
-               return NULL;
-       }
-
-       ret = sqlite3_prepare_v2(GET_DB(manifest_db), query, strlen(query),
-                       &stmt, NULL);
-       free(query);
-       if (ret != SQLITE_OK) {
-               LOGE("prepare failed: %s", sqlite3_errmsg(GET_DB(manifest_db)));
-               return NULL;
+               return PMINFO_R_ERROR;
        }
 
-       while (sqlite3_step(stmt) == SQLITE_ROW) {
-               _save_column_str(stmt, 0, (const char **)&appid);
-               list = g_slist_append(list, appid);
-       }
+       node->key = strdup(key);
+       if (value && strlen(value))
+               node->value = strdup(value);
 
-       sqlite3_finalize(stmt);
+       filter->list_metadata = g_slist_append(filter->list_metadata,
+                       (gpointer)node);
 
-       return list;
+       return PMINFO_R_OK;
 }
 
 API int pkgmgrinfo_appinfo_usr_metadata_filter_foreach(
                pkgmgrinfo_appinfo_metadata_filter_h handle,
                pkgmgrinfo_app_list_cb app_cb, void *user_data, uid_t uid)
 {
-       GSList *list;
-       GSList *tmp;
-       char *appid;
-       pkgmgrinfo_appinfo_h info;
-       int stop = 0;
-
        if (handle == NULL || app_cb == NULL) {
                LOGE("invalid parameter");
                return PMINFO_R_EINVAL;
        }
 
-       if (__open_manifest_db(uid) < 0)
-               return PMINFO_R_ERROR;
-
-       list = _appinfo_get_metadata_filtered_list(handle);
-       if (list == NULL) {
-               LOGE("no result");
-               __close_manifest_db();
-               return PMINFO_R_OK;
-       }
-
-       for (tmp = list; tmp; tmp = tmp->next) {
-               appid = (char *)tmp->data;
-               if (stop == 0) {
-                       if (pkgmgrinfo_appinfo_get_usr_appinfo(appid, uid,
-                                               &info)) {
-                               free(appid);
-                               continue;
-                       }
-                       if (app_cb(info, user_data) < 0)
-                               stop = 1;
-                       pkgmgrinfo_appinfo_destroy_appinfo(info);
-               }
-               free(appid);
-       }
-
-       g_slist_free(list);
-       __close_manifest_db();
-
-       return PMINFO_R_OK;
+       return _appinfo_get_filtered_foreach_appinfo(uid, handle, PMINFO_APPINFO_GET_ALL, app_cb,
+                       user_data);
 }
 
-API int pkgmgrinfo_appinfo_metadata_filter_foreach(pkgmgrinfo_appinfo_metadata_filter_h handle,
+API int pkgmgrinfo_appinfo_metadata_filter_foreach(
+               pkgmgrinfo_appinfo_metadata_filter_h handle,
                pkgmgrinfo_app_list_cb app_cb, void *user_data)
 {
-       return pkgmgrinfo_appinfo_usr_metadata_filter_foreach(handle, app_cb, user_data, GLOBAL_USER);
+       return pkgmgrinfo_appinfo_usr_metadata_filter_foreach(handle, app_cb,
+                       user_data, _getuid());
 }
 
 API int pkgmgrinfo_appinfo_is_guestmode_visibility(pkgmgrinfo_appinfo_h handle, bool *status)
@@ -2132,7 +3206,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;
 }