From e5477100569cdc671f62974f69db802f041a0c0c Mon Sep 17 00:00:00 2001 From: Tomasz Iwanek Date: Wed, 1 Jun 2016 12:56:52 +0200 Subject: [PATCH] Remove ime checking for tizen:service Ime app is supposed to be main app only. This is not related to tizen:service (service application). Change-Id: I4c0046a07c4d019887a084d3cbe64127e89d6886 --- src/wgt/step/configuration/step_parse.cc | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc index 0b9f251..ad485ca 100644 --- a/src/wgt/step/configuration/step_parse.cc +++ b/src/wgt/step/configuration/step_parse.cc @@ -265,8 +265,8 @@ bool StepParse::FillMainApplicationInfo(manifest_x* manifest) { }) != category_info->categories.end(); has_ime = std::find(category_info->categories.begin(), category_info->categories.end(), - kImeCategoryName - ) != category_info->categories.end(); + kImeCategoryName) + != category_info->categories.end(); } // application data @@ -315,16 +315,6 @@ bool StepParse::FillServiceApplicationInfo(manifest_x* manifest) { parser_->GetManifestData(app_keys::kTizenServiceKey)); if (!service_list) return true; - bool has_ime = false; - std::shared_ptr category_info = - std::static_pointer_cast( - parser_->GetManifestData(app_keys::kTizenCategoryKey)); - if (category_info) { - has_ime = std::find(category_info->categories.begin(), - category_info->categories.end(), - kImeCategoryName - ) != category_info->categories.end(); - } for (auto& service_info : service_list->services) { application_x* application = reinterpret_cast (calloc(1, sizeof(application_x))); @@ -340,8 +330,8 @@ bool StepParse::FillServiceApplicationInfo(manifest_x* manifest) { service_info.on_boot() ? strdup("true") : strdup("false"); application->autorestart = service_info.auto_restart() ? strdup("true") : strdup("false"); - application->nodisplay = has_ime ? strdup("true") : strdup("false"); - application->taskmanage = has_ime ? strdup("false") : strdup("true"); + application->nodisplay = strdup("false"); + application->taskmanage = strdup("true"); SetApplicationXDefaults(application); application->ambient_support = strdup("false"); application->package = strdup(manifest->package); -- 2.7.4