From: Bartlomiej Kunikowski Date: Mon, 27 Feb 2017 08:49:43 +0000 (+0100) Subject: Adjust some values in xml X-Git-Tag: accepted/tizen/common/20170309.175302~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3526d8f04d571aade72c0ef63e7f2d16ecb02df;p=platform%2Fcore%2Fappfw%2Fwgt-backend.git Adjust some values in xml - Onboot and autorestart features of service application has removed since 2.3.1 in wearable, 2.4 in all other profiles - So change modified xml files if needed (hybrid) - Change modified this options in context before generate manifest (wgt) Requires: - https://review.tizen.org/gerrit/#/c/116622/ Change-Id: Ie539cc25b5f1628adcc9e816f3436b7e7fdc245b --- diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc index eca31a4..33b9d26 100644 --- a/src/hybrid/hybrid_installer.cc +++ b/src/hybrid/hybrid_installer.cc @@ -73,6 +73,7 @@ #include #include #include +#include #include #include "hybrid/hybrid_backend_data.h" @@ -139,6 +140,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -191,6 +193,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -272,6 +275,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -334,6 +338,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -385,6 +390,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -415,6 +421,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -449,6 +456,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep( diff --git a/src/wgt/step/security/step_check_settings_level.cc b/src/wgt/step/security/step_check_settings_level.cc index 2fd5923..b26f7ed 100644 --- a/src/wgt/step/security/step_check_settings_level.cc +++ b/src/wgt/step/security/step_check_settings_level.cc @@ -4,17 +4,31 @@ #include "wgt/step/security/step_check_settings_level.h" +#include +#include #include +#include #include #include #include "wgt/wgt_backend_data.h" -namespace { +namespace wgt { +namespace security { -bool ValidateSettingsForLevel(common_installer::PrivilegeLevel level, - const wgt::parse::SettingInfo& settings) { +common_installer::Step::Status StepCheckSettingsLevel::process() { + if (!ValidateSettingsForLevel()) { + return Status::PRIVILEGE_ERROR; + } + LOG(INFO) << "Settings privilege level checked"; + return Status::OK; +} + +bool StepCheckSettingsLevel::ValidateSettingsForLevel() { + common_installer::PrivilegeLevel level = context_->privilege_level.get(); + wgt::parse::SettingInfo& settings = static_cast( + context_->backend_data.get())->settings.get(); if (settings.background_vibration()) { common_installer::PrivilegeLevel required_level = common_installer::PrivilegeLevel::PARTNER; @@ -58,22 +72,29 @@ bool ValidateSettingsForLevel(common_installer::PrivilegeLevel level, } LOG(INFO) << "Setting: 'sound-mode' allowed"; } - return true; -} -} // namespace + if ((level != common_installer::PrivilegeLevel::PARTNER) && + (level != common_installer::PrivilegeLevel::PLATFORM)) { + utils::VersionNumber api_version = + utils::VersionNumber(context_->manifest_data.get()->api_version); + utils::VersionNumber platform_version = + utils::VersionNumber((common_installer::GetTizenProfile() == + common_installer::TizenProfile::WEARABLE) ? "2.3.1" : "2.4.0"); + if (api_version >= platform_version) { + for (const auto& app : GListRange( + context_->manifest_data.get()->application)) { + if (app->autorestart) + free(app->autorestart); + app->autorestart = strdup("false"); -namespace wgt { -namespace security { - -common_installer::Step::Status StepCheckSettingsLevel::process() { - if (!ValidateSettingsForLevel(context_->privilege_level.get(), - static_cast( - context_->backend_data.get())->settings.get())) { - return Status::PRIVILEGE_ERROR; + if (app->onboot) + free(app->onboot); + app->onboot = strdup("false"); + } + } } - LOG(INFO) << "Settings privilege level checked"; - return Status::OK; + + return true; } } // namespace security diff --git a/src/wgt/step/security/step_check_settings_level.h b/src/wgt/step/security/step_check_settings_level.h index adc7337..772188b 100644 --- a/src/wgt/step/security/step_check_settings_level.h +++ b/src/wgt/step/security/step_check_settings_level.h @@ -50,6 +50,9 @@ class StepCheckSettingsLevel : public common_installer::Step { */ Status precheck() override { return Status::OK; } + private: + bool ValidateSettingsForLevel(); + STEP_NAME(CheckSettingsLevel) };