From fff005e051e312d9dd6d654a0d387ad4ac2e8f31 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Mon, 18 Feb 2019 10:54:06 +0900
Subject: [PATCH 01/16] Add dependency explicitly

Change-Id: I8e1bdf8da1dc6019f58746af201fcaaa5986637a
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 src/unit_tests/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt
index 37022f8..5e98bc3 100644
--- a/src/unit_tests/CMakeLists.txt
+++ b/src/unit_tests/CMakeLists.txt
@@ -30,11 +30,13 @@ APPLY_PKG_CONFIG(${TARGET_SMOKE_TEST} PUBLIC
   Boost
   GTEST
   GUM_DEPS
+  VCONF_DEPS
 )
 APPLY_PKG_CONFIG(${TARGET_SMOKE_TEST_EXTENSIVE} PUBLIC
   Boost
   GTEST
   GUM_DEPS
+  VCONF_DEPS
 )
 APPLY_PKG_CONFIG(${TARGET_MANIFEST_TEST} PUBLIC
   Boost
-- 
2.7.4


From a32138eca3ca76cef9ba6c6c8b3bf326592307a6 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Mon, 18 Feb 2019 11:32:45 +0900
Subject: [PATCH 02/16] Release version 0.11.1

Changes:
 - Add dependency explicitly

Change-Id: I552e71e47d81268af4d82a9b01dbad022dbe89fe
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 packaging/wgt-backend.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index 71832fb..7dab1c5 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -1,6 +1,6 @@
 Name:           wgt-backend
 Summary:        Application installer backend for WGT
-Version:        0.11.0
+Version:        0.11.1
 Release:        1
 Group:          Application Framework/Package Management
 License:        Apache-2.0
-- 
2.7.4


From 505119e910147abc7b371ae4a305e9fb0beb3588 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Mon, 18 Feb 2019 20:19:24 +0900
Subject: [PATCH 03/16] Change action type when enable wgt pkgs

- When wgt pkg being enabled, plugin should be executed as "Install".

Change-Id: If47320cbe7b022c68c7658fa91369e8a5982b9bb
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 2 +-
 src/wgt/wgt_installer.cc       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 95adccd..4ea41da 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -732,7 +732,7 @@ void HybridInstaller::EnablePkgSteps() {
   AddStep<ci::pkgmgr::StepUpdatePkgDisableInfo>(
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
+      ci::Plugin::ActionType::Install);
 }
 
 void HybridInstaller::DisablePkgSteps() {
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 1c20ef8..ed09adf 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -714,7 +714,7 @@ void WgtInstaller::EnablePkgSteps() {
   AddStep<ci::pkgmgr::StepUpdatePkgDisableInfo>(
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
+      ci::Plugin::ActionType::Install);
 }
 
 void WgtInstaller::DisablePkgSteps() {
-- 
2.7.4


From fcf231726fc774b923a4382232636453b3f24bf9 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Thu, 21 Feb 2019 20:10:35 +0900
Subject: [PATCH 04/16] Change visibility of steps to protected

For extensibility, change visibility to protected.

Requires:
 - https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/200321

Change-Id: Ic1e3cfe37e83e0afd479cdcb5b4cdf7852bc2c64
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 src/hybrid/hybrid_installer.h | 2 +-
 src/wgt/wgt_installer.h       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hybrid/hybrid_installer.h b/src/hybrid/hybrid_installer.h
index b76cc10..2102a55 100644
--- a/src/hybrid/hybrid_installer.h
+++ b/src/hybrid/hybrid_installer.h
@@ -27,7 +27,7 @@ class HybridInstaller : public common_installer::AppInstaller {
 
   SCOPE_LOG_TAG(HybridInstaller)
 
- private:
+ protected:
   void InstallSteps() override;
   void UpdateSteps() override;
   void UninstallSteps() override;
diff --git a/src/wgt/wgt_installer.h b/src/wgt/wgt_installer.h
index 8c0edcf..d0a4c2b 100644
--- a/src/wgt/wgt_installer.h
+++ b/src/wgt/wgt_installer.h
@@ -25,7 +25,7 @@ class WgtInstaller : public common_installer::AppInstaller {
    */
   explicit WgtInstaller(common_installer::PkgMgrPtr pkgrmgr);
 
- private:
+ protected:
   void InstallSteps() override;
   void UpdateSteps() override;
   void UninstallSteps() override;
-- 
2.7.4


From 42019b478305c100ca2746e47039c54dc2b38811 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Fri, 15 Feb 2019 14:11:07 +0900
Subject: [PATCH 05/16] Add StepRegisterPluginInfo

- By adding procedure for storing plugin execution info,
  additional Step for storing it to db is needed.

Related changes:
[pkgmgr-info] : https://review.tizen.org/gerrit/#/c/platform/core/appfw/pkgmgr-info/+/195920/
[app-installers] : https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/195744/

Change-Id: I7a970d0cd482f722ab7a0c83a1b073b05b0c6104
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 17 +++++++++++++++++
 src/wgt/wgt_installer.cc       | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 4ea41da..82e8d34 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -59,11 +59,14 @@
 #include <common/step/pkgmgr/step_kill_apps.h>
 #include <common/step/pkgmgr/step_recover_application.h>
 #include <common/step/pkgmgr/step_register_app.h>
+#include <common/step/pkgmgr/step_register_plugin_info.h>
 #include <common/step/pkgmgr/step_remove_manifest.h>
 #include <common/step/pkgmgr/step_run_parser_plugins.h>
 #include <common/step/pkgmgr/step_unregister_app.h>
+#include <common/step/pkgmgr/step_unregister_plugin_info.h>
 #include <common/step/pkgmgr/step_update_app.h>
 #include <common/step/pkgmgr/step_update_pkg_disable_info.h>
+#include <common/step/pkgmgr/step_update_plugin_info.h>
 #include <common/step/recovery/step_open_recovery_file.h>
 #include <common/step/recovery/step_create_recovery_file.h>
 #include <common/step/security/step_check_signature.h>
@@ -170,6 +173,7 @@ void HybridInstaller::InstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -231,6 +235,7 @@ void HybridInstaller::UpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -261,6 +266,7 @@ void HybridInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
+  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
@@ -328,6 +334,7 @@ void HybridInstaller::DeltaSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -405,6 +412,7 @@ void HybridInstaller::MountInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
@@ -465,6 +473,7 @@ void HybridInstaller::MountUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -505,6 +514,7 @@ void HybridInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -548,6 +558,7 @@ void HybridInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -575,6 +586,7 @@ void HybridInstaller::ManifestPartialInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -606,6 +618,7 @@ void HybridInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -683,6 +696,7 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -721,6 +735,7 @@ void HybridInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
 }
 
 void HybridInstaller::EnablePkgSteps() {
@@ -733,6 +748,7 @@ void HybridInstaller::EnablePkgSteps() {
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
 }
 
 void HybridInstaller::DisablePkgSteps() {
@@ -745,6 +761,7 @@ void HybridInstaller::DisablePkgSteps() {
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
+  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
 }
 
 void HybridInstaller::MigrateExtImgSteps() {
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index ed09adf..0f7600f 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -66,11 +66,14 @@
 #include <common/step/pkgmgr/step_recover_application.h>
 #include <common/step/pkgmgr/step_recover_parser_plugins.h>
 #include <common/step/pkgmgr/step_register_app.h>
+#include <common/step/pkgmgr/step_register_plugin_info.h>
 #include <common/step/pkgmgr/step_remove_manifest.h>
 #include <common/step/pkgmgr/step_run_parser_plugins.h>
 #include <common/step/pkgmgr/step_unregister_app.h>
+#include <common/step/pkgmgr/step_unregister_plugin_info.h>
 #include <common/step/pkgmgr/step_update_app.h>
 #include <common/step/pkgmgr/step_update_pkg_disable_info.h>
+#include <common/step/pkgmgr/step_update_plugin_info.h>
 #include <common/step/rds/step_rds_modify.h>
 #include <common/step/rds/step_rds_parse.h>
 #include <common/step/recovery/step_open_recovery_file.h>
@@ -171,6 +174,7 @@ void WgtInstaller::InstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -226,6 +230,7 @@ void WgtInstaller::UpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -257,6 +262,7 @@ void WgtInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
+  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
@@ -282,6 +288,7 @@ void WgtInstaller::ReinstallSteps() {
   AddStep<wgt::security::StepCheckExtensionPrivileges>();
   AddStep<ci::security::StepRegisterTrustAnchor>(
       ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::security::StepPrivacyPrivilege>(
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
@@ -343,6 +350,7 @@ void WgtInstaller::DeltaSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -414,6 +422,7 @@ void WgtInstaller::MountInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
@@ -466,6 +475,7 @@ void WgtInstaller::MountUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -498,6 +508,7 @@ void WgtInstaller::ManifestDirectInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Install);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -535,6 +546,7 @@ void WgtInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -583,6 +595,7 @@ void WgtInstaller::ReadonlyUpdateInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -621,6 +634,7 @@ void WgtInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
 }
 
 void WgtInstaller::ManifestPartialInstallSteps() {
@@ -641,6 +655,7 @@ void WgtInstaller::ManifestPartialInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Install);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
+  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -669,6 +684,7 @@ void WgtInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -727,6 +743,7 @@ void WgtInstaller::DisablePkgSteps() {
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
+  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
 }
 
 void WgtInstaller::MigrateExtImgSteps() {
-- 
2.7.4


From b56bf01a695f8c2b482a8c5f8ecca630cc230519 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Wed, 13 Mar 2019 15:30:42 +0900
Subject: [PATCH 06/16] Add step StepCheckUpgradable

This step check the package upgradable using package dependency info.

Change-Id: Iff3753104596ebd347adf8b1ba80575cd9819de2
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 7 +++++++
 src/wgt/wgt_installer.cc       | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 82e8d34..4a258a2 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -56,6 +56,7 @@
 #include <common/step/pkgmgr/step_check_installable.h>
 #include <common/step/pkgmgr/step_check_removable.h>
 #include <common/step/pkgmgr/step_check_restriction.h>
+#include <common/step/pkgmgr/step_check_upgradable.h>
 #include <common/step/pkgmgr/step_kill_apps.h>
 #include <common/step/pkgmgr/step_recover_application.h>
 #include <common/step/pkgmgr/step_register_app.h>
@@ -187,6 +188,7 @@ void HybridInstaller::UpdateSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<hybrid::configuration::StepStashTpkConfig>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
@@ -282,6 +284,7 @@ void HybridInstaller::DeltaSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<wgt::filesystem::StepWgtUndoPatchStorageDirectories>();
   AddStep<hybrid::configuration::StepStashTpkConfig>();
   AddStep<ci::configuration::StepParseManifest>(
@@ -426,6 +429,7 @@ void HybridInstaller::MountUpdateSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<hybrid::configuration::StepStashTpkConfig>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
@@ -526,6 +530,7 @@ void HybridInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<hybrid::configuration::StepStashTpkConfig>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
@@ -651,6 +656,7 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<hybrid::configuration::StepStashTpkConfig>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
@@ -713,6 +719,7 @@ void HybridInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<wgt::configuration::StepSetOldSignatureFilesLocation>();
   AddStep<ci::security::StepCheckSignature>();
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 0f7600f..c68ddd9 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -62,6 +62,7 @@
 #include <common/step/pkgmgr/step_check_installable.h>
 #include <common/step/pkgmgr/step_check_removable.h>
 #include <common/step/pkgmgr/step_check_restriction.h>
+#include <common/step/pkgmgr/step_check_upgradable.h>
 #include <common/step/pkgmgr/step_kill_apps.h>
 #include <common/step/pkgmgr/step_recover_application.h>
 #include <common/step/pkgmgr/step_recover_parser_plugins.h>
@@ -188,6 +189,7 @@ void WgtInstaller::UpdateSteps() {
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::PACKAGE, true);
   AddStep<ci::configuration::StepCheckInstallLocation>();
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::security::StepCheckSignature>();
@@ -306,6 +308,7 @@ void WgtInstaller::DeltaSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::BACKUP);
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::filesystem::StepEnableExternalMount>();
@@ -436,6 +439,7 @@ void WgtInstaller::MountUpdateSteps() {
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::PACKAGE, true);
   AddStep<ci::configuration::StepCheckInstallLocation>();
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::security::StepCheckSignature>();
@@ -520,6 +524,7 @@ void WgtInstaller::ManifestDirectUpdateSteps() {
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
   AddStep<ci::mount::StepCheckMountPath>();
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<wgt::security::StepDirectManifestCheckSignature>();
@@ -558,6 +563,7 @@ void WgtInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::filesystem::StepUnzip>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::PACKAGE, true);
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::security::StepCheckSignature>();
@@ -611,6 +617,7 @@ void WgtInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<wgt::configuration::StepSetOldSignatureFilesLocation>();
   AddStep<ci::security::StepCheckSignature>();
-- 
2.7.4


From 7c60d3668d37367aab4b3d4fb6244d9fa515b307 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Fri, 15 Mar 2019 17:35:33 +0900
Subject: [PATCH 07/16] Release version 0.12.0

Changes:
 - Change action type when enable wgt pkgs
 - Change visibility of steps to protected
 - Add StepRegisterPluginInfo
 - Add step StepCheckUpgradable

Change-Id: I22faea5e03bb136d257be058f7b0b97b54ab913a
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 packaging/wgt-backend.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index 7dab1c5..abd8c79 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -1,6 +1,6 @@
 Name:           wgt-backend
 Summary:        Application installer backend for WGT
-Version:        0.11.1
+Version:        0.12.0
 Release:        1
 Group:          Application Framework/Package Management
 License:        Apache-2.0
-- 
2.7.4


From 9377c3c5bd8c9dd3022bc66d0f72b72b8dfd3448 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Wed, 17 Apr 2019 17:35:05 +0900
Subject: [PATCH 08/16] Fix double free

Change-Id: I724a8e0a7bd8ab6608ba511daff41b2796f4fab8
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 src/wgt/step/security/step_check_extension_privileges.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/wgt/step/security/step_check_extension_privileges.cc b/src/wgt/step/security/step_check_extension_privileges.cc
index 281c47e..b5330bd 100755
--- a/src/wgt/step/security/step_check_extension_privileges.cc
+++ b/src/wgt/step/security/step_check_extension_privileges.cc
@@ -62,7 +62,7 @@ common_installer::Step::Status StepCheckExtensionPrivileges::process() {
     }
   }
   GList* privileges = nullptr;
-  BOOST_SCOPE_EXIT_ALL(&) {
+  BOOST_SCOPE_EXIT_ALL(privileges) {
     g_list_free_full(privileges, &common_installer::FreePrivilegeX);
   };
   for (auto it = xmlFiles.begin(); it != xmlFiles.end(); ++it) {
@@ -75,21 +75,18 @@ common_installer::Step::Status StepCheckExtensionPrivileges::process() {
             reinterpret_cast<privilege_x*>(calloc(1, sizeof(privilege_x)));
         if (!privilege) {
           LOG(ERROR) << "Out of memory";
-          g_list_free_full(privileges, &common_installer::FreePrivilegeX);
           return Status::ERROR;
         }
         privilege->type = strdup(common_installer::kWebPrivilegeType);
         if (!privilege->type) {
           LOG(ERROR) << "Out of memory";
           common_installer::FreePrivilegeX(privilege);
-          g_list_free_full(privileges, &common_installer::FreePrivilegeX);
           return Status::ERROR;
         }
         privilege->value = strdup(priv.c_str());
         if (!privilege->value) {
           LOG(ERROR) << "Out of memory";
           common_installer::FreePrivilegeX(privilege);
-          g_list_free_full(privileges, &common_installer::FreePrivilegeX);
           return Status::ERROR;
         }
         privileges = g_list_append(privileges, privilege);
-- 
2.7.4


From de87811ddd513f714e95b23aef8948f04241c23c Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Wed, 17 Apr 2019 20:41:20 +0900
Subject: [PATCH 09/16] Do not call Init() for initialize steps

Init() will be called internally by AppInstaller class. (inside Run())

Requires:
 - https://review.tizen.org/gerrit/c/platform/core/appfw/app-installers/+/203760

Change-Id: I394b98ee0eebc6abba220d619108da15822e43d6
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 src/wgt/wgt_installer.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index c68ddd9..285bf57 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -129,7 +129,6 @@ namespace wgt {
 
 WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
     : AppInstaller("wgt", pkgrmgr) {
-  Init();
   context_->backend_data.set(new WgtBackendData());
 }
 
-- 
2.7.4


From a6ff43f836d62bfa383c8cda625fc6283242ef72 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Thu, 18 Apr 2019 11:16:49 +0900
Subject: [PATCH 10/16] Release version 0.12.1

Changes:
 - Fix double free
 - Do not call Init() for initialize steps

Change-Id: I24802f28ff828fa6d9944d80714d377b4dca8d89
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 packaging/wgt-backend.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index abd8c79..118957c 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -1,6 +1,6 @@
 Name:           wgt-backend
 Summary:        Application installer backend for WGT
-Version:        0.12.0
+Version:        0.12.1
 Release:        1
 Group:          Application Framework/Package Management
 License:        Apache-2.0
-- 
2.7.4


From 22d083ab8899b7a6b143985e40f80284ac63b37a Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Thu, 18 Apr 2019 13:51:30 +0900
Subject: [PATCH 11/16] Fix build error on hybrid backend

Change-Id: I78e6da2e672a2a903dc09cb4897c76a739807603
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 4a258a2..d87ba82 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -119,7 +119,6 @@ namespace hybrid {
 
 HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
     : AppInstaller("wgt", pkgmgr) {
-  Init();
   context_->cross_app_rules.set(true);
   context_->backend_data.set(new HybridBackendData());
 }
-- 
2.7.4


From 646bf7a8490e90f1adc9bacd53825495b19b98ab Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Thu, 18 Apr 2019 14:44:45 +0900
Subject: [PATCH 12/16] Release version 0.12.2

Changes:
 - Fix build error on hybrid backend

Change-Id: I9cdbb2ec99f10c7f1c72ca12b0159cbb1837582a
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 packaging/wgt-backend.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index 118957c..104f5f7 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -1,6 +1,6 @@
 Name:           wgt-backend
 Summary:        Application installer backend for WGT
-Version:        0.12.1
+Version:        0.12.2
 Release:        1
 Group:          Application Framework/Package Management
 License:        Apache-2.0
-- 
2.7.4


From 345270807279bd0e9d07e48c6c4c2eca441fb171 Mon Sep 17 00:00:00 2001
From: ilho <ilho159.kim@samsung.com>
Date: Mon, 15 Apr 2019 18:41:10 +0900
Subject: [PATCH 13/16] Combine Signature Steps

StepCheckSignature and StepSaveSignature are combined

Related changes
    [app-installers] https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/203140/
    [tpk-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/tpk-backend/+/203141/
    [wgt-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/wgt-backend/+/203513/

Change-Id: I5385c1503e3d55eb291f0c7d6455c21a07fe4301
Signed-off-by: ilho <ilho159.kim@samsung.com>
---
 src/hybrid/hybrid_installer.cc                     | 35 +++++++-------------
 .../step_direct_manifest_check_signature.h         | 28 ----------------
 ...nature.cc => step_direct_manifest_signature.cc} |  8 ++---
 .../step/security/step_direct_manifest_signature.h | 34 +++++++++++++++++++
 src/wgt/wgt_installer.cc                           | 38 ++++++++--------------
 5 files changed, 63 insertions(+), 80 deletions(-)
 delete mode 100644 src/wgt/step/security/step_direct_manifest_check_signature.h
 rename src/wgt/step/security/{step_direct_manifest_check_signature.cc => step_direct_manifest_signature.cc} (53%)
 create mode 100644 src/wgt/step/security/step_direct_manifest_signature.h

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index d87ba82..424b3cb 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -70,7 +70,6 @@
 #include <common/step/pkgmgr/step_update_plugin_info.h>
 #include <common/step/recovery/step_open_recovery_file.h>
 #include <common/step/recovery/step_create_recovery_file.h>
-#include <common/step/security/step_check_signature.h>
 #include <common/step/security/step_get_privilege_level.h>
 #include <common/step/security/step_privacy_privilege.h>
 #include <common/step/security/step_privilege_compatibility.h>
@@ -80,7 +79,7 @@
 #include <common/step/security/step_revoke_security.h>
 #include <common/step/security/step_revoke_trust_anchor.h>
 #include <common/step/security/step_rollback_installation_security.h>
-#include <common/step/security/step_save_signature.h>
+#include <common/step/security/step_signature.h>
 #include <common/step/security/step_update_security.h>
 #include <common/step/security/step_register_trust_anchor.h>
 #include <common/step/security/step_unregister_trust_anchor.h>
@@ -137,8 +136,7 @@ void HybridInstaller::InstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -193,8 +191,7 @@ void HybridInstaller::UpdateSteps() {
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -296,8 +293,7 @@ void HybridInstaller::DeltaSteps() {
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -378,8 +374,7 @@ void HybridInstaller::MountInstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -434,8 +429,7 @@ void HybridInstaller::MountUpdateSteps() {
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -493,8 +487,7 @@ void HybridInstaller::ManifestDirectInstallSteps() {
       wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -535,8 +528,7 @@ void HybridInstaller::ManifestDirectUpdateSteps() {
       wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -579,8 +571,7 @@ void HybridInstaller::ManifestPartialInstallSteps() {
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
   AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::pkgmgr::StepRegisterApplication>();
   AddStep<ci::security::StepRegisterTrustAnchor>(
@@ -607,8 +598,7 @@ void HybridInstaller::ManifestPartialUpdateSteps() {
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
   AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::BACKUP);
@@ -661,8 +651,7 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -721,7 +710,7 @@ void HybridInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<wgt::configuration::StepSetOldSignatureFilesLocation>();
-  AddStep<ci::security::StepCheckSignature>();
+  AddStep<ci::security::StepSignature>(false);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<ci::configuration::StepSwitchReadonlyMode>();
diff --git a/src/wgt/step/security/step_direct_manifest_check_signature.h b/src/wgt/step/security/step_direct_manifest_check_signature.h
deleted file mode 100644
index a56a998..0000000
--- a/src/wgt/step/security/step_direct_manifest_check_signature.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
-// Use of this source code is governed by an apache-2.0 license that can be
-// found in the LICENSE file.
-
-#ifndef WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_CHECK_SIGNATURE_H_
-#define WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_CHECK_SIGNATURE_H_
-
-#include <common/step/security/step_check_signature.h>
-#include <manifest_parser/utils/logging.h>
-
-namespace wgt {
-namespace security {
-
-class StepDirectManifestCheckSignature
-    : public common_installer::security::StepCheckSignature {
- public:
-  using StepCheckSignature::StepCheckSignature;
-
- private:
-  boost::filesystem::path GetSignatureRoot() const override;
-
-  STEP_NAME(StepDirectManifestCheckSignature)
-};
-
-}  // namespace security
-}  // namespace wgt
-
-#endif  // WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_CHECK_SIGNATURE_H_
diff --git a/src/wgt/step/security/step_direct_manifest_check_signature.cc b/src/wgt/step/security/step_direct_manifest_signature.cc
similarity index 53%
rename from src/wgt/step/security/step_direct_manifest_check_signature.cc
rename to src/wgt/step/security/step_direct_manifest_signature.cc
index 469a490..8d3e646 100644
--- a/src/wgt/step/security/step_direct_manifest_check_signature.cc
+++ b/src/wgt/step/security/step_direct_manifest_signature.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#include "wgt/step/security/step_direct_manifest_check_signature.h"
+#include "wgt/step/security/step_direct_manifest_signature.h"
 
 namespace bf = boost::filesystem;
 
@@ -15,8 +15,8 @@ const char kResWgt[] = "res/wgt";
 namespace wgt {
 namespace security {
 
-bf::path StepDirectManifestCheckSignature::GetSignatureRoot() const {
-  return StepCheckSignature::GetSignatureRoot() / kResWgt;
+bf::path StepDirectManifestSignature::GetSignatureRoot() const {
+  return StepSignature::GetSignatureRoot() / kResWgt;
 }
 
 }  // namespace security
diff --git a/src/wgt/step/security/step_direct_manifest_signature.h b/src/wgt/step/security/step_direct_manifest_signature.h
new file mode 100644
index 0000000..d7910f2
--- /dev/null
+++ b/src/wgt/step/security/step_direct_manifest_signature.h
@@ -0,0 +1,34 @@
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by an apache-2.0 license that can be
+// found in the LICENSE file.
+
+#ifndef WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_SIGNATURE_H_
+#define WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_SIGNATURE_H_
+
+#include <common/step/security/step_signature.h>
+#include <manifest_parser/utils/logging.h>
+
+namespace ci = common_installer;
+
+namespace wgt {
+namespace security {
+
+class StepDirectManifestSignature
+    : public ci::security::StepSignature {
+ public:
+  using StepSignature::StepSignature;
+
+  StepDirectManifestSignature(ci::InstallerContext* context,
+        bool save_signature) :
+                ci::security::StepSignature(context, save_signature) {}
+
+ private:
+  boost::filesystem::path GetSignatureRoot() const override;
+
+  STEP_NAME(StepDirectManifestSignature)
+};
+
+}  // namespace security
+}  // namespace wgt
+
+#endif  // WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_SIGNATURE_H_
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 285bf57..885353a 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -80,7 +80,6 @@
 #include <common/step/recovery/step_open_recovery_file.h>
 #include <common/step/recovery/step_create_recovery_file.h>
 #include <common/step/security/step_check_old_certificate.h>
-#include <common/step/security/step_check_signature.h>
 #include <common/step/security/step_get_privilege_level.h>
 #include <common/step/security/step_privacy_privilege.h>
 #include <common/step/security/step_privilege_compatibility.h>
@@ -93,7 +92,7 @@
 #include <common/step/security/step_update_security.h>
 #include <common/step/security/step_register_trust_anchor.h>
 #include <common/step/security/step_revoke_trust_anchor.h>
-#include <common/step/security/step_save_signature.h>
+#include <common/step/security/step_signature.h>
 #include <common/step/security/step_unregister_trust_anchor.h>
 
 #include <wgt_manifest_handlers/widget_config_parser.h>
@@ -119,7 +118,7 @@
 #include "wgt/step/security/step_check_wgt_background_category.h"
 #include "wgt/step/security/step_check_wgt_notification_category.h"
 #include "wgt/step/security/step_check_wgt_ime_privilege.h"
-#include "wgt/step/security/step_direct_manifest_check_signature.h"
+#include "wgt/step/security/step_direct_manifest_signature.h"
 #include "wgt/step/security/step_check_extension_privileges.h"
 #include "wgt/step/security/step_wgt_recover_signature.h"
 
@@ -143,8 +142,7 @@ void WgtInstaller::InstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -191,8 +189,7 @@ void WgtInstaller::UpdateSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -315,8 +312,7 @@ void WgtInstaller::DeltaSteps() {
   AddStep<ci::filesystem::StepDeltaPatch>("res/wgt/");
   AddStep<ci::filesystem::StepDisableExternalMount>();
   AddStep<wgt::configuration::StepCheckStartFiles>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -394,8 +390,7 @@ void WgtInstaller::MountInstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -441,8 +436,7 @@ void WgtInstaller::MountUpdateSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -492,8 +486,7 @@ void WgtInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::mount::StepCheckMountPath>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<wgt::security::StepDirectManifestCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<wgt::security::StepDirectManifestSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckWgtNotificationCategory>();
@@ -526,8 +519,7 @@ void WgtInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<wgt::security::StepDirectManifestCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<wgt::security::StepDirectManifestSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckWgtNotificationCategory>();
@@ -565,8 +557,7 @@ void WgtInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -619,8 +610,7 @@ void WgtInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<wgt::configuration::StepSetOldSignatureFilesLocation>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<ci::configuration::StepSwitchReadonlyMode>();
@@ -648,8 +638,7 @@ void WgtInstaller::ManifestPartialInstallSteps() {
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
   AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
@@ -675,8 +664,7 @@ void WgtInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::BACKUP);
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
-- 
2.7.4


From fd0d702e912fb81e31e5dd46655e1c51bd4e3a83 Mon Sep 17 00:00:00 2001
From: Ilho Kim <ilho159.kim@samsung.com>
Date: Thu, 16 May 2019 12:01:04 +0900
Subject: [PATCH 14/16] Standardize use of STEP_NAME()

In case class name is StepExampleClass, Pass "ExampleClass" to STEP_NAME()

Change-Id: I94effc1c0d26e1498483bf941d2bf0d0af6f84ba
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
---
 src/hybrid/hybrid_installer.cc                         | 18 +++++++++---------
 .../pkgmgr/{step_generate_xml.cc => step_merge_xml.cc} | 14 +++++++-------
 .../pkgmgr/{step_generate_xml.h => step_merge_xml.h}   | 12 ++++++------
 src/wgt/step/filesystem/step_create_symbolic_link.h    |  2 +-
 .../filesystem/step_wgt_patch_storage_directories.h    |  2 +-
 src/wgt/step/filesystem/step_wgt_resource_directory.h  |  2 +-
 .../step_wgt_undo_patch_storage_directories.h          |  2 +-
 src/wgt/step/security/step_direct_manifest_signature.h |  2 +-
 8 files changed, 27 insertions(+), 27 deletions(-)
 rename src/hybrid/step/pkgmgr/{step_generate_xml.cc => step_merge_xml.cc} (93%)
 rename src/hybrid/step/pkgmgr/{step_generate_xml.h => step_merge_xml.h} (79%)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 424b3cb..520fada 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -97,7 +97,7 @@
 #include "hybrid/step/configuration/step_merge_tpk_privileges.h"
 #include "hybrid/step/configuration/step_stash_tpk_config.h"
 #include "hybrid/step/encryption/step_encrypt_resources.h"
-#include "hybrid/step/pkgmgr/step_generate_xml.h"
+#include "hybrid/step/pkgmgr/step_merge_xml.h"
 #include "wgt/step/configuration/step_parse.h"
 #include "wgt/step/configuration/step_set_old_signature_files_location.h"
 #include "wgt/step/encryption/step_remove_encryption_data.h"
@@ -157,7 +157,7 @@ void HybridInstaller::InstallSteps() {
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
   AddStep<ci::filesystem::StepCreateStorageDirectories>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
-  AddStep<hybrid::pkgmgr::StepGenerateXml>();
+  AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
@@ -219,7 +219,7 @@ void HybridInstaller::UpdateSteps() {
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
   AddStep<ci::filesystem::StepCopyStorageDirectories>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
-  AddStep<hybrid::pkgmgr::StepGenerateXml>();
+  AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
@@ -318,7 +318,7 @@ void HybridInstaller::DeltaSteps() {
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
   AddStep<ci::filesystem::StepCopyStorageDirectories>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
-  AddStep<hybrid::pkgmgr::StepGenerateXml>();
+  AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
@@ -395,7 +395,7 @@ void HybridInstaller::MountInstallSteps() {
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
   AddStep<ci::filesystem::StepCreateStorageDirectories>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
-  AddStep<hybrid::pkgmgr::StepGenerateXml>();
+  AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
@@ -456,7 +456,7 @@ void HybridInstaller::MountUpdateSteps() {
   AddStep<wgt::filesystem::StepCopyPreviewIcons>();
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
-  AddStep<hybrid::pkgmgr::StepGenerateXml>();
+  AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
@@ -498,7 +498,7 @@ void HybridInstaller::ManifestDirectInstallSteps() {
   AddStep<tpk::filesystem::StepTpkPatchIcons>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
-  AddStep<hybrid::pkgmgr::StepGenerateXml>();
+  AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
@@ -542,7 +542,7 @@ void HybridInstaller::ManifestDirectUpdateSteps() {
   AddStep<tpk::filesystem::StepTpkPatchIcons>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
-  AddStep<hybrid::pkgmgr::StepGenerateXml>();
+  AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
@@ -676,7 +676,7 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
   AddStep<ci::filesystem::StepCreateStorageDirectories>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
-  AddStep<hybrid::pkgmgr::StepGenerateXml>();
+  AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
diff --git a/src/hybrid/step/pkgmgr/step_generate_xml.cc b/src/hybrid/step/pkgmgr/step_merge_xml.cc
similarity index 93%
rename from src/hybrid/step/pkgmgr/step_generate_xml.cc
rename to src/hybrid/step/pkgmgr/step_merge_xml.cc
index 10246e9..0c87c0d 100644
--- a/src/hybrid/step/pkgmgr/step_generate_xml.cc
+++ b/src/hybrid/step/pkgmgr/step_merge_xml.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#include "hybrid/step/pkgmgr/step_generate_xml.h"
+#include "hybrid/step/pkgmgr/step_merge_xml.h"
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
@@ -51,7 +51,7 @@ const std::vector<std::pair<std::string, std::string>> kApplicationNodeNames = {
 namespace hybrid {
 namespace pkgmgr {
 
-bool StepGenerateXml::LoadXmlDocument(const bf::path& wgt_xml_path,
+bool StepMergeXml::LoadXmlDocument(const bf::path& wgt_xml_path,
     const bf::path& tpk_xml_path) {
   // trim blanks
   int keep_blanks = xmlKeepBlanksDefault(0);
@@ -71,7 +71,7 @@ bool StepGenerateXml::LoadXmlDocument(const bf::path& wgt_xml_path,
   return true;
 }
 
-xmlNodePtr StepGenerateXml::GetXmlNode(const xmlDocPtr doc,
+xmlNodePtr StepMergeXml::GetXmlNode(const xmlDocPtr doc,
     const std::string& name, const std::string& attr,
     const std::string& attr_val) {
   xmlXPathContextPtr ctxt = xmlXPathNewContext(doc);
@@ -98,7 +98,7 @@ xmlNodePtr StepGenerateXml::GetXmlNode(const xmlDocPtr doc,
   return node;
 }
 
-void StepGenerateXml::MergeXmlNode(xmlNodePtr node1, xmlNodePtr node2) {
+void StepMergeXml::MergeXmlNode(xmlNodePtr node1, xmlNodePtr node2) {
   xmlNodePtr last = xmlGetLastChild(node1);
   xmlNodePtr next;
   // merge node2's child into node1
@@ -116,13 +116,13 @@ void StepGenerateXml::MergeXmlNode(xmlNodePtr node1, xmlNodePtr node2) {
   }
 }
 
-void StepGenerateXml::SetXmlNodeAttribute(xmlNodePtr node,
+void StepMergeXml::SetXmlNodeAttribute(xmlNodePtr node,
     const std::string& attr, const std::string& attr_val) {
   xmlSetProp(node, reinterpret_cast<const xmlChar*>(attr.c_str()),
       reinterpret_cast<const xmlChar*>(attr_val.c_str()));
 }
 
-ci::Step::Status StepGenerateXml::process() {
+ci::Step::Status StepMergeXml::process() {
   bf::path wgt_xml_path = context_->xml_path.get();
   bf::path tpk_xml_path = context_->GetPkgPath() / "tizen-manifest.xml";
 
@@ -172,7 +172,7 @@ ci::Step::Status StepGenerateXml::process() {
   return Status::OK;
 }
 
-ci::Step::Status StepGenerateXml::precheck() {
+ci::Step::Status StepMergeXml::precheck() {
   bf::path wgt_xml_path = context_->xml_path.get();
   if (!bf::exists(wgt_xml_path)) {
     LOG(ERROR) << "Converted config file not found: " << wgt_xml_path;
diff --git a/src/hybrid/step/pkgmgr/step_generate_xml.h b/src/hybrid/step/pkgmgr/step_merge_xml.h
similarity index 79%
rename from src/hybrid/step/pkgmgr/step_generate_xml.h
rename to src/hybrid/step/pkgmgr/step_merge_xml.h
index 8fce64d..7f75295 100644
--- a/src/hybrid/step/pkgmgr/step_generate_xml.h
+++ b/src/hybrid/step/pkgmgr/step_merge_xml.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef HYBRID_STEP_PKGMGR_STEP_GENERATE_XML_H_
-#define HYBRID_STEP_PKGMGR_STEP_GENERATE_XML_H_
+#ifndef HYBRID_STEP_PKGMGR_STEP_MERGE_XML_H_
+#define HYBRID_STEP_PKGMGR_STEP_MERGE_XML_H_
 
 #include <boost/filesystem.hpp>
 
@@ -16,10 +16,10 @@
 namespace hybrid {
 namespace pkgmgr {
 
-class StepGenerateXml : public common_installer::Step {
+class StepMergeXml : public common_installer::Step {
  public:
   using Step::Step;
-  explicit StepGenerateXml(common_installer::InstallerContext* context)
+  explicit StepMergeXml(common_installer::InstallerContext* context)
       : Step(context), wgt_doc_(nullptr), tpk_doc_(nullptr) {}
   Status process() override;
   Status clean() override { return Status::OK; }
@@ -38,10 +38,10 @@ class StepGenerateXml : public common_installer::Step {
   xmlDocPtr wgt_doc_;
   xmlDocPtr tpk_doc_;
 
-  STEP_NAME(GenerateXml2);
+  STEP_NAME(MergeXml);
 };
 
 }  // namespace pkgmgr
 }  // namespace hybrid
 
-#endif  // HYBRID_STEP_PKGMGR_STEP_GENERATE_XML_H_
+#endif  // HYBRID_STEP_PKGMGR_STEP_MERGE_XML_H_
diff --git a/src/wgt/step/filesystem/step_create_symbolic_link.h b/src/wgt/step/filesystem/step_create_symbolic_link.h
index 048c759..c1129e7 100644
--- a/src/wgt/step/filesystem/step_create_symbolic_link.h
+++ b/src/wgt/step/filesystem/step_create_symbolic_link.h
@@ -55,7 +55,7 @@ class StepCreateSymbolicLink : public common_installer::Step {
  private:
   bool CreateSymlinksForApps();
 
-  STEP_NAME(SymbolicLink)
+  STEP_NAME(CreateSymbolicLink)
 };
 
 }  // namespace filesystem
diff --git a/src/wgt/step/filesystem/step_wgt_patch_storage_directories.h b/src/wgt/step/filesystem/step_wgt_patch_storage_directories.h
index 96c5da6..f6692c6 100644
--- a/src/wgt/step/filesystem/step_wgt_patch_storage_directories.h
+++ b/src/wgt/step/filesystem/step_wgt_patch_storage_directories.h
@@ -31,7 +31,7 @@ class StepWgtPatchStorageDirectories :
   bool ShareDirFor3x();
   bool CreatePrivateTmpDir();
 
-  STEP_NAME(PatchWgtStorageDirectories)
+  STEP_NAME(WgtPatchStorageDirectories)
 };
 
 }  // namespace filesystem
diff --git a/src/wgt/step/filesystem/step_wgt_resource_directory.h b/src/wgt/step/filesystem/step_wgt_resource_directory.h
index f5437fd..f81ebd5 100644
--- a/src/wgt/step/filesystem/step_wgt_resource_directory.h
+++ b/src/wgt/step/filesystem/step_wgt_resource_directory.h
@@ -53,7 +53,7 @@ class StepWgtResourceDirectory : public common_installer::Step {
    */
   Status precheck() override { return Status::OK; }
 
-  STEP_NAME(CreateWgtResourceDirectory)
+  STEP_NAME(WgtResourceDirectory)
 };
 
 }  // namespace filesystem
diff --git a/src/wgt/step/filesystem/step_wgt_undo_patch_storage_directories.h b/src/wgt/step/filesystem/step_wgt_undo_patch_storage_directories.h
index e8494ad..00c1dcd 100644
--- a/src/wgt/step/filesystem/step_wgt_undo_patch_storage_directories.h
+++ b/src/wgt/step/filesystem/step_wgt_undo_patch_storage_directories.h
@@ -31,7 +31,7 @@ class StepWgtUndoPatchStorageDirectories :
   bool UndoShareDirFor3x();
   boost::filesystem::path backup_dir_;
 
-  STEP_NAME(UndoPatchWgtStorageDirectories)
+  STEP_NAME(WgtUndoPatchStorageDirectories)
 };
 
 }  // namespace filesystem
diff --git a/src/wgt/step/security/step_direct_manifest_signature.h b/src/wgt/step/security/step_direct_manifest_signature.h
index d7910f2..df8c7e8 100644
--- a/src/wgt/step/security/step_direct_manifest_signature.h
+++ b/src/wgt/step/security/step_direct_manifest_signature.h
@@ -25,7 +25,7 @@ class StepDirectManifestSignature
  private:
   boost::filesystem::path GetSignatureRoot() const override;
 
-  STEP_NAME(StepDirectManifestSignature)
+  STEP_NAME(DirectManifestSignature)
 };
 
 }  // namespace security
-- 
2.7.4


From 12851bebf160c185040b18babb4d89eee8372023 Mon Sep 17 00:00:00 2001
From: Ilho Kim <ilho159.kim@samsung.com>
Date: Fri, 26 Apr 2019 15:32:57 +0900
Subject: [PATCH 15/16] Combine Plugin Steps

StepRunParserPlugin combines below steps
 - StepRegisterPluginInfo
 - StepUpdatePluginInfo
 - StepUnregisterPluginInfo

Related changes
    [app-installers] https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/204652/
    [tpk-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/tpk-backend/+/204757/
    [wgt-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/wgt-backend/+/205385/

Change-Id: Ib430c9b0c71c82fc2ccf73e4af8bd1f3db66a470
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 17 -----------------
 src/wgt/wgt_installer.cc       | 19 ++-----------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 520fada..0e6841c 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -60,14 +60,11 @@
 #include <common/step/pkgmgr/step_kill_apps.h>
 #include <common/step/pkgmgr/step_recover_application.h>
 #include <common/step/pkgmgr/step_register_app.h>
-#include <common/step/pkgmgr/step_register_plugin_info.h>
 #include <common/step/pkgmgr/step_remove_manifest.h>
 #include <common/step/pkgmgr/step_run_parser_plugins.h>
 #include <common/step/pkgmgr/step_unregister_app.h>
-#include <common/step/pkgmgr/step_unregister_plugin_info.h>
 #include <common/step/pkgmgr/step_update_app.h>
 #include <common/step/pkgmgr/step_update_pkg_disable_info.h>
-#include <common/step/pkgmgr/step_update_plugin_info.h>
 #include <common/step/recovery/step_open_recovery_file.h>
 #include <common/step/recovery/step_create_recovery_file.h>
 #include <common/step/security/step_get_privilege_level.h>
@@ -171,7 +168,6 @@ void HybridInstaller::InstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -233,7 +229,6 @@ void HybridInstaller::UpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -264,7 +259,6 @@ void HybridInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
@@ -332,7 +326,6 @@ void HybridInstaller::DeltaSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -409,7 +402,6 @@ void HybridInstaller::MountInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
@@ -470,7 +462,6 @@ void HybridInstaller::MountUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -510,7 +501,6 @@ void HybridInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -554,7 +544,6 @@ void HybridInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -581,7 +570,6 @@ void HybridInstaller::ManifestPartialInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -612,7 +600,6 @@ void HybridInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -690,7 +677,6 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -730,7 +716,6 @@ void HybridInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
 }
 
 void HybridInstaller::EnablePkgSteps() {
@@ -743,7 +728,6 @@ void HybridInstaller::EnablePkgSteps() {
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
 }
 
 void HybridInstaller::DisablePkgSteps() {
@@ -756,7 +740,6 @@ void HybridInstaller::DisablePkgSteps() {
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
 }
 
 void HybridInstaller::MigrateExtImgSteps() {
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 885353a..2ea02b0 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -67,14 +67,11 @@
 #include <common/step/pkgmgr/step_recover_application.h>
 #include <common/step/pkgmgr/step_recover_parser_plugins.h>
 #include <common/step/pkgmgr/step_register_app.h>
-#include <common/step/pkgmgr/step_register_plugin_info.h>
 #include <common/step/pkgmgr/step_remove_manifest.h>
 #include <common/step/pkgmgr/step_run_parser_plugins.h>
 #include <common/step/pkgmgr/step_unregister_app.h>
-#include <common/step/pkgmgr/step_unregister_plugin_info.h>
 #include <common/step/pkgmgr/step_update_app.h>
 #include <common/step/pkgmgr/step_update_pkg_disable_info.h>
-#include <common/step/pkgmgr/step_update_plugin_info.h>
 #include <common/step/rds/step_rds_modify.h>
 #include <common/step/rds/step_rds_parse.h>
 #include <common/step/recovery/step_open_recovery_file.h>
@@ -172,7 +169,6 @@ void WgtInstaller::InstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -228,7 +224,6 @@ void WgtInstaller::UpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -260,7 +255,6 @@ void WgtInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
@@ -286,7 +280,8 @@ void WgtInstaller::ReinstallSteps() {
   AddStep<wgt::security::StepCheckExtensionPrivileges>();
   AddStep<ci::security::StepRegisterTrustAnchor>(
       ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
+  AddStep<ci::pkgmgr::StepRunParserPlugin>(
+      ci::Plugin::ActionType::Upgrade);
   AddStep<ci::security::StepPrivacyPrivilege>(
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
@@ -348,7 +343,6 @@ void WgtInstaller::DeltaSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -419,7 +413,6 @@ void WgtInstaller::MountInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
@@ -472,7 +465,6 @@ void WgtInstaller::MountUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -504,7 +496,6 @@ void WgtInstaller::ManifestDirectInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Install);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -542,7 +533,6 @@ void WgtInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -591,7 +581,6 @@ void WgtInstaller::ReadonlyUpdateInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -630,7 +619,6 @@ void WgtInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
 }
 
 void WgtInstaller::ManifestPartialInstallSteps() {
@@ -650,7 +638,6 @@ void WgtInstaller::ManifestPartialInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Install);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -678,7 +665,6 @@ void WgtInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -737,7 +723,6 @@ void WgtInstaller::DisablePkgSteps() {
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
 }
 
 void WgtInstaller::MigrateExtImgSteps() {
-- 
2.7.4


From 685cda0812ce778ac9b4281e9fa2931c87f15b84 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Fri, 26 Apr 2019 14:55:58 +0900
Subject: [PATCH 16/16] Fix ManifestDirectInstall mode of hybrid installer

Installer should parse modified (tpk & wgt combined) manifest.
(Some information such as preload are needed)

Change-Id: Iefee0992f526de4fa2d5f5cbc56e1a78bfd80782
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 0e6841c..281c9f4 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -510,7 +510,7 @@ void HybridInstaller::ManifestDirectInstallSteps() {
 void HybridInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
+      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<hybrid::configuration::StepStashTpkConfig>();
@@ -578,7 +578,7 @@ void HybridInstaller::ManifestPartialInstallSteps() {
 void HybridInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
+      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<hybrid::configuration::StepStashTpkConfig>();
   AddStep<wgt::configuration::StepParse>(
-- 
2.7.4