Temporary fix for hybrid pkg installation 85/92585/3 accepted/tizen/3.0/ivi/20161028.123108 accepted/tizen/3.0/mobile/20161028.122420 accepted/tizen/3.0/tv/20161028.122640 accepted/tizen/3.0/wearable/20161028.122906 accepted/tizen/common/20161017.170459 accepted/tizen/ivi/20161018.091315 accepted/tizen/mobile/20161018.091157 accepted/tizen/tv/20161018.091247 accepted/tizen/wearable/20161018.091301 submit/tizen/20161017.122727 submit/tizen_3.0/20161028.062323 submit/tizen_3.0/20161028.082323 submit/tizen_3.0_common/20161104.104000
authorSangyoon Jang <s89.jang@samsung.com>
Mon, 17 Oct 2016 11:51:42 +0000 (20:51 +0900)
committerSangyoon Jang <s89.jang@samsung.com>
Mon, 17 Oct 2016 12:17:47 +0000 (21:17 +0900)
Submit together:
 - https://review.tizen.org/gerrit/92582
 - https://review.tizen.org/gerrit/92583
 - https://review.tizen.org/gerrit/92584

Change-Id: I7c384edb28e298b6eb7484ee604a03bf686a6684
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
src/common/step/configuration/step_parse_manifest.cc
src/common/step/configuration/step_parse_manifest.h

index 215e69e..be9abdd 100644 (file)
@@ -372,6 +372,9 @@ bool StepParseManifest::FillWidgetApplication(manifest_x* manifest) {
       return false;
     if (!FillMetadata(widget_app, application.meta_data))
       return false;
+    // FIXME: For hotfix, must be removed
+    if (!FillSupportSize(widget_app, application.support_sizes))
+      return false;
   }
   return true;
 }
@@ -706,6 +709,23 @@ bool StepParseManifest::FillMetadata(application_x* app,
   return true;
 }
 
+// FIXME: For hotfix, must be removed
+template <typename T>
+bool StepParseManifest::FillSupportSize(application_x* app,
+                                        const T& support_size_list) {
+  if (support_size_list.empty())
+    return true;
+
+  for (auto& ss : support_size_list) {
+    support_size_x* support_size =
+        static_cast<support_size_x*>(calloc(1, sizeof(support_size_x)));
+    support_size->preview = strdup(ss.preview().c_str());
+    support_size->size = strdup(ss.size().c_str());
+    app->support_sizes = g_list_append(app->support_sizes, support_size);
+  }
+  return true;
+}
+
 template <typename T>
 bool StepParseManifest::FillCategories(application_x* manifest,
                                      const T& categories) {
index 79d81dc..1e8d7af 100644 (file)
@@ -84,6 +84,9 @@ class StepParseManifest : public common_installer::Step {
       bool FillLabel(application_x* manifest, const T& label_list);
   template <typename T>
       bool FillMetadata(application_x* manifest, const T& meta_data_list);
+  // FIXME: For hotfix, must be removed
+  template <typename T>
+      bool FillSupportSize(application_x* manifest, const T& support_size_list);
   template <typename T>
       bool FillCategories(application_x* manifest, const T& meta_data_list);
   bool FillImage(application_x* app,