Fix ManifestDirectInstall mode of hybrid installer 58/204758/5
authorSangyoon Jang <jeremy.jang@samsung.com>
Fri, 26 Apr 2019 05:55:58 +0000 (14:55 +0900)
committerSangyoon Jang <jeremy.jang@samsung.com>
Fri, 31 May 2019 01:55:43 +0000 (01:55 +0000)
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

index 0e6841c..281c9f4 100644 (file)
@@ -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>(