From e7b478f789b4ddc35e78125f9a50da6eab3269d2 Mon Sep 17 00:00:00 2001
From: Ilho Kim <ilho159.kim@samsung.com>
Date: Mon, 21 Oct 2019 17:31:45 +0900
Subject: [PATCH] Adjust order of steps

Revert from '192eddd5a83d207a760c025c328e3096f8debdca'

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

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 079754f..d25264d 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -239,6 +239,8 @@ void HybridInstaller::UninstallSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::pkgmgr::StepRunParserPlugin>(
+      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
@@ -254,8 +256,6 @@ void HybridInstaller::UninstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Uninstall);
   AddStep<ci::security::StepRevokeSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 840bd81..2031f14 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -236,6 +236,8 @@ void WgtInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
+  AddStep<ci::pkgmgr::StepRunParserPlugin>(
+      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
   AddStep<ci::pkgmgr::StepUnregisterApplication>();
   AddStep<ci::filesystem::StepRemoveTep>();
@@ -248,8 +250,6 @@ void WgtInstaller::UninstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Uninstall);
   AddStep<ci::security::StepRevokeSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
-- 
2.7.4