Add types for pkg/app support mode

- Add string types for pkg/app support mode
- Add comment about OR-ing of support mode.
  db column which is for pkg/app support mode should
  store support mode of itself.

Change-Id: I2d6b20f3ca67ed26e0ec9971f8a9e751f7b445b8
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/include/pkgmgrinfo_type.h b/include/pkgmgrinfo_type.h
index 8d81738..fb929d5 100644 (file)
--- a/include/pkgmgrinfo_type.h
+++ b/include/pkgmgrinfo_type.h
@@ -46,10 +46,15 @@
 #define APP_BG_CATEGORY_IOTCOMM_STR                    "iot-communication"
 #define APP_BG_CATEGORY_SYSTEM                         "system"
 
-/* Integer property for mode */
-#define        APP_SUPPORT_MODE_ULTRA_POWER_SAVING             0x00001
-#define        APP_SUPPORT_MODE_COOL_DOWN                              0x00002
-#define        APP_SUPPORT_MODE_SCREEN_READER                  0x00004
+/* Integer property for support-mode */
+#define        APP_SUPPORT_MODE_ULTRA_POWER_SAVING_VAL         0x00001
+#define        APP_SUPPORT_MODE_COOL_DOWN_VAL                          0x00002
+#define        APP_SUPPORT_MODE_SCREEN_READER_VAL                      0x00004
+
+/* String property for support-mode */
+#define APP_SUPPORT_MODE_ULTRA_POWER_SAVING_STR                "ultra-power-saving"
+#define APP_SUPPORT_MODE_COOL_DOWN_STR         "cool-down"
+#define APP_SUPPORT_MODE_SCREEN_READER_STR             "screen-reader"
 
 /**
  * @brief A type to retrieve uid information from the manifest handle

diff --git a/parser/src/pkgmgr_parser_db.c b/parser/src/pkgmgr_parser_db.c
index 4fdbf5a..934133a 100644 (file)
--- a/parser/src/pkgmgr_parser_db.c
+++ b/parser/src/pkgmgr_parser_db.c
@@ -1264,7 +1264,7 @@ static int __insert_application_info(manifest_x *mfx)
                        "app_launch_mode, app_ui_gadget, app_support_mode, app_support_disable, component_type, package, " \
                        "app_tep_name, app_zip_mount_file, app_background_category, app_package_type, app_root_path, " \
                        "app_api_version, app_effective_appid, app_splash_screen_display, app_package_system, app_removable, " \
-                       "app_package_installed_time, app_support_mode) " \
+                       "app_package_installed_time) " \
                        "VALUES(" \
                        "%Q, %Q, %Q, LOWER(%Q), %Q, " \
                        "LOWER(%Q), LOWER(%Q), LOWER(%Q), LOWER(%Q), LOWER(%Q), " \
@@ -1274,7 +1274,7 @@ static int __insert_application_info(manifest_x *mfx)
                        "COALESCE(%Q, 'caller'), LOWER(%Q), %Q, LOWER(%Q), %Q, %Q, " \
                        "%Q, %Q, %d, %Q, %Q, " \
                        "%Q, %Q, LOWER(%Q), LOWER(%Q), LOWER(%Q), " \
-                       "%Q, %Q)", \
+                       "%Q)", \
                        app->appid, app->component_type, app->exec, __get_bool(app->nodisplay, false), app->type,
                        __get_bool(app->onboot, false), __get_bool(app->multiple, false), __get_bool(app->autorestart, false), __get_bool(app->taskmanage, false), __get_bool(app->enabled, true),
                        app->hwacceleration, app->screenreader, app->mainapp, app->recentimage, app->launchcondition,
@@ -1283,7 +1283,7 @@ static int __insert_application_info(manifest_x *mfx)
                        __get_bool(mfx->preload, false), __get_bool(app->submode, false), app->submode_mainid, mfx->installed_storage, __get_bool(app->process_pool, false),
                        app->launch_mode, __get_bool(app->ui_gadget, false), mfx->support_mode, __get_bool(mfx->support_disable, false), app->component_type, mfx->package,
                        mfx->tep_name, mfx->zip_mount_file, background_value, type, mfx->root_path, mfx->api_version,
-                       effective_appid, __get_bool(app->splash_screen_display, false), __get_bool(mfx->system, false), __get_bool(mfx->removable, true), mfx->installed_time, mfx->support_mode);
+                       effective_appid, __get_bool(app->splash_screen_display, false), __get_bool(mfx->system, false), __get_bool(mfx->removable, true), mfx->installed_time);
 
                ret = __exec_query(query);
                if (ret == -1) {
@@ -1915,6 +1915,7 @@ static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid)
        if (mfx->support_mode)
                temp_pkg_mode = atoi(mfx->support_mode);
 
+       /* FIXME : OR-ing should be fixed to not to store whole support mode */
        list_up = mfx->application;
        while (list_up != NULL) {
                up_support_mode = (application_x *)list_up->data;
@@ -1926,7 +1927,7 @@ static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid)
        }
        snprintf(pkg_mode, MAX_INTEGER_LENGTH, "%d", temp_pkg_mode);
 
-       if(mfx->support_mode)
+       if (mfx->support_mode)
                free((void *)mfx->support_mode);
        mfx->support_mode = strdup(pkg_mode);
 
@@ -1937,19 +1938,19 @@ static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid)
                "install_location, package_size, package_removable, package_preload, package_readonly, " \
                "package_update, package_appsetting, package_nodisplay, package_system, author_name, " \
                "author_email, author_href, installed_time, installed_storage, storeclient_id, " \
-               "mainapp_id, package_url, root_path, csc_path, package_support_mode, package_support_disable, package_support_mode) " \
+               "mainapp_id, package_url, root_path, csc_path, package_support_mode, package_support_disable) " \
                "VALUES(" \
                "%Q, %Q, %Q, %Q, %Q, %Q, " \
                "%Q, %Q, LOWER(%Q), LOWER(%Q), LOWER(%Q), " \
                "LOWER(%Q), LOWER(%Q), LOWER(%Q), LOWER(%Q), %Q, " \
                "%Q, %Q, %Q, %Q, %Q, " \
-               "%Q, %Q, %Q, %Q, %Q, LOWER(%Q), %Q)",
+               "%Q, %Q, %Q, %Q, %Q, LOWER(%Q))",
                mfx->package, mfx->type, mfx->version, mfx->api_version, mfx->tep_name, mfx->zip_mount_file,
                mfx->installlocation, mfx->package_size, __get_bool(mfx->removable, true), __get_bool(mfx->preload, false), __get_bool(mfx->readonly, false),
                __get_bool(mfx->update, false), __get_bool(mfx->appsetting, false), __get_bool(mfx->nodisplay_setting, false), __get_bool(mfx->system, false), auth_name,
                auth_email, auth_href, mfx->installed_time, mfx->installed_storage,
                mfx->storeclient_id,
-               mfx->mainapp_id, mfx->package_url, mfx->root_path, mfx->csc_path, mfx->support_mode, __get_bool(mfx->support_disable, false), mfx->support_mode);
+               mfx->mainapp_id, mfx->package_url, mfx->root_path, mfx->csc_path, mfx->support_mode, __get_bool(mfx->support_disable, false));
 
        ret = __exec_query(query);
        if (ret == -1) {