From a619faf452f2573cc20d38e5ff3cceb0286b9561 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Wed, 24 Jan 2018 14:14:27 +0900
Subject: [PATCH] Fix RecoverySteps of hybrid backend

Add missing steps.

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

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 5ec69e9..3b69022 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -33,6 +33,7 @@
 #include <common/step/filesystem/step_recover_icons.h>
 #include <common/step/filesystem/step_recover_manifest.h>
 #include <common/step/filesystem/step_recover_external_storage.h>
+#include <common/step/filesystem/step_recover_per_user_storage_directories.h>
 #include <common/step/filesystem/step_recover_storage_directories.h>
 #include <common/step/filesystem/step_remove_files.h>
 #include <common/step/filesystem/step_remove_icons.h>
@@ -66,6 +67,7 @@
 #include <common/step/security/step_check_signature.h>
 #include <common/step/security/step_privacy_privilege.h>
 #include <common/step/security/step_privilege_compatibility.h>
+#include <common/step/security/step_recover_privilege_compatibility.h>
 #include <common/step/security/step_recover_security.h>
 #include <common/step/security/step_register_security.h>
 #include <common/step/security/step_revoke_security.h>
@@ -331,10 +333,13 @@ void HybridInstaller::RecoverySteps() {
   AddStep<ci::filesystem::StepRecoverIcons>();
   AddStep<ci::filesystem::StepRecoverManifest>();
   AddStep<ci::filesystem::StepRecoverExternalStorage>();
+  AddStep<ci::filesystem::StepRecoverPerUserStorageDirectories>();
   AddStep<ci::filesystem::StepRecoverStorageDirectories>();
   AddStep<ci::filesystem::StepRecoverFiles>();
   AddStep<ci::mount::StepMountRecover>();
   AddStep<tpk::security::StepTpkRecoverSignature>();
+  AddStep<ci::security::StepRecoverPrivilegeCompatibility>(
+      ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
   AddStep<ci::filesystem::StepRecoverChangeOwner>();
   AddStep<ci::security::StepRecoverSecurity>();
   AddStep<ci::pkgmgr::StepRecoverApplication>();
-- 
2.7.4