Parse api-version of application if exist

Change-Id: I52dfe3477cd951b9f2b098486f3fbaa7dcd601f3
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/common/step/configuration/step_parse_manifest.cc b/src/common/step/configuration/step_parse_manifest.cc
index a55e416..4672a53 100644 (file)
--- a/src/common/step/configuration/step_parse_manifest.cc
+++ b/src/common/step/configuration/step_parse_manifest.cc
@@ -499,7 +499,11 @@ bool StepParseManifest::FillWidgetApplication(manifest_x* manifest) {
     widget_app->package = strdup(manifest->package);
     widget_app->support_disable = strdup(manifest->support_disable);
     widget_app->launch_mode = strdup("single");
-    widget_app->api_version = strdup(manifest->api_version);
+    if (!application.app_info.api_version().empty())
+      widget_app->api_version =
+          strdup(application.app_info.api_version().c_str());
+    else
+      widget_app->api_version = strdup(manifest->api_version);
     manifest->application = g_list_append(manifest->application, widget_app);
     if (bf::path(application.app_info.exec().c_str()).is_absolute())
       widget_app->exec = strdup(application.app_info.exec().c_str());
@@ -571,7 +575,11 @@ bool StepParseManifest::FillServiceApplication(manifest_x* manifest) {
     service_app->package = strdup(manifest->package);
     service_app->support_disable = strdup(manifest->support_disable);
     service_app->launch_mode = strdup("single");
-    service_app->api_version = strdup(manifest->api_version);
+    if (!application.app_info.api_version().empty())
+      service_app->api_version =
+          strdup(application.app_info.api_version().c_str());
+    else
+      service_app->api_version = strdup(manifest->api_version);
     manifest->application = g_list_append(manifest->application, service_app);
     if (bf::path(application.app_info.exec().c_str()).is_absolute())
       service_app->exec = strdup(application.app_info.exec().c_str());
@@ -669,7 +677,10 @@ bool StepParseManifest::FillUIApplication(manifest_x* manifest) {
     ui_app->support_disable = strdup(manifest->support_disable);
     ui_app->splash_screen_display =
         strdup(application.app_info.splash_screen_display().c_str());
-    ui_app->api_version = strdup(manifest->api_version);
+    if (!application.app_info.api_version().empty())
+      ui_app->api_version = strdup(application.app_info.api_version().c_str());
+    else
+      ui_app->api_version = strdup(manifest->api_version);
     manifest->application = g_list_append(manifest->application, ui_app);
     if (bf::path(application.app_info.exec().c_str()).is_absolute())
       ui_app->exec = strdup(application.app_info.exec().c_str());
@@ -754,7 +765,11 @@ bool StepParseManifest::FillWatchApplication(manifest_x* manifest) {
         strdup((std::to_string(app_support_mode_val)).c_str());
     watch_app->ui_gadget = strdup("false");
     watch_app->launch_mode = strdup("single");
-    watch_app->api_version = strdup(manifest->api_version);
+    if (!watch_application.app_info.api_version().empty())
+      watch_app->api_version =
+          strdup(watch_application.app_info.api_version().c_str());
+    else
+      watch_app->api_version = strdup(manifest->api_version);
     watch_app->support_ambient =
         strdup(watch_application.app_info.ambient_support().c_str());
     watch_app->package = strdup(manifest->package);
@@ -1217,7 +1232,10 @@ bool StepParseManifest::FillComponentBasedApplicationInfo(
     app->package = strdup(manifest->package);
     app->support_disable = strdup(manifest->support_disable);
     app->launch_mode = strdup("single");
-    app->api_version = strdup(manifest->api_version);
+    if (!application.app_info.api_version().empty())
+      app->api_version = strdup(application.app_info.api_version().c_str());
+    else
+      app->api_version = strdup(manifest->api_version);
     app->splash_screen_display =
         strdup(application.app_info.splash_screen_display().c_str());
     manifest->application = g_list_append(manifest->application, app);