Remove StepKillRscApps step

AMD will charge of killing apps which uses resource being installed or updated.

Change-Id: I80a7432625ddf6fa5919c42829f4248ba6eacd00
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/rpk/rpk_installer.cc b/src/rpk/rpk_installer.cc
index 29ab97b..97c4740 100644 (file)
--- a/src/rpk/rpk_installer.cc
+++ b/src/rpk/rpk_installer.cc
@@ -8,7 +8,6 @@
 #include "lib/rpk_archive_info.h"
 #include "rpk/step/configuration/step_parse_rpk_manifest.h"
 #include "rpk/step/pkgmgr/step_rpk_manifest_adjustment.h"
-#include "rpk/step/pkgmgr/step_kill_rscapps.h"
 
 namespace ci = common_installer;
 
@@ -73,7 +72,7 @@ void RpkInstaller::InstallSteps() {
 void RpkInstaller::UpdateSteps() {
   AppInstaller::UpdateSteps();
 
-  ReplaceStep<rpk::pkgmgr::StepKillRscApps>("KillApps");
+  RemoveStep("KillApps");
   RemoveStep("BackupIcons");
   RemoveStep("RemoveGlobalAppSymlinks");
   RemoveStep("AcquireExternalStorage");
@@ -128,7 +127,7 @@ void RpkInstaller::UpdateSteps() {
 void RpkInstaller::UninstallSteps() {
   AppInstaller::UninstallSteps();
 
-  ReplaceStep<rpk::pkgmgr::StepKillRscApps>("KillApps");
+  RemoveStep("KillApps");
   RemoveStep("RunParserPlugin");
   RemoveStep("RemoveGlobalAppSymlinks");
   RemoveStep("OptionalAcquireExternalStorage");
@@ -232,7 +231,7 @@ void RpkInstaller::ManifestDirectUpdateSteps() {
   AppInstaller::ManifestDirectUpdateSteps();
 
   RemoveStep("CheckMountPath");
-  ReplaceStep<rpk::pkgmgr::StepKillRscApps>("KillApps");
+  RemoveStep("KillApps");
   RemoveStep("RemoveGlobalAppSymlinks");
   RemoveStep("CreateResControlDirectories");
   RemoveStep("RegisterTrustAnchor");
@@ -297,7 +296,7 @@ void RpkInstaller::ManifestPartialUpdateSteps() {
   AppInstaller::ManifestPartialUpdateSteps();
 
   RemoveStep("RemoveGlobalAppSymlinks");
-  ReplaceStep<rpk::pkgmgr::StepKillRscApps>("KillApps");
+  RemoveStep("KillApps");
   RemoveStep("RegisterTrustAnchor");
   RemoveStep("PrivacyPrivilege");
   RemoveStep("RunParserPlugin");
@@ -353,7 +352,7 @@ void RpkInstaller::PartialUninstallSteps() {
 void RpkInstaller::ReadonlyUpdateInstallSteps() {
   AppInstaller::ReadonlyUpdateInstallSteps();
 
-  ReplaceStep<rpk::pkgmgr::StepKillRscApps>("KillApps");
+  RemoveStep("KillApps");
   RemoveStep("RevokeTrustAnchor");
   RemoveStep("CopyTep");
   RemoveStep("CreateIcons");
@@ -404,7 +403,7 @@ void RpkInstaller::ReadonlyUpdateInstallSteps() {
 void RpkInstaller::ReadonlyUpdateUninstallSteps() {
   AppInstaller::ReadonlyUpdateUninstallSteps();
 
-  ReplaceStep<rpk::pkgmgr::StepKillRscApps>("KillApps");
+  RemoveStep("KillApps");
   RemoveStep("RemoveGlobalAppSymlinks");
   RemoveStep("RevokeTrustAnchor");
   RemoveStep("RegisterTrustAnchor");

diff --git a/src/rpk/step/pkgmgr/step_kill_rscapps.cc b/src/rpk/step/pkgmgr/step_kill_rscapps.cc
deleted file mode 100644 (file)
index 229a846..0000000
--- a/src/rpk/step/pkgmgr/step_kill_rscapps.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2021 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 "step/pkgmgr/step_kill_rscapps.h"
-
-#include <sys/time.h>
-#include <systemd/sd-login.h>
-#include <aul.h>
-
-#include <chrono>
-#include <string>
-
-namespace rpk {
-namespace pkgmgr {
-
-common_installer::Step::Status StepKillRscApps::process() {
-
-  return common_installer::Step::Status::OK;
-}
-
-common_installer::Step::Status StepKillRscApps::precheck() {
-  return common_installer::Step::Status::OK;
-}
-
-}  // namespace pkgmgr
-}  // namespace rpk

diff --git a/src/rpk/step/pkgmgr/step_kill_rscapps.h b/src/rpk/step/pkgmgr/step_kill_rscapps.h
deleted file mode 100644 (file)
index a21de2e..0000000
--- a/src/rpk/step/pkgmgr/step_kill_rscapps.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2021 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 STEP_PKGMGR_STEP_KILL_RSCAPPS_H_
-#define STEP_PKGMGR_STEP_KILL_RSCAPPS_H_
-
-#include <manifest_parser/utils/logging.h>
-
-#include "common/installer_context.h"
-#include "common/step/step.h"
-
-namespace rpk {
-namespace pkgmgr {
-
-/**
- * \brief Step responsible for killing applications which are
- *        using resource package being updated
- *
- */
-class StepKillRscApps : public common_installer::Step {
- public:
-  using Step::Step;
-
-  /**
-   * \brief main logic for killing applications
-   *
-   * \return Status::OK
-   */
-  Status process() override;
-  Status clean() override { return Status::OK; }
-  Status undo() override { return Status::OK; }
-
-  /**
-   * \brief checks if neccessary data is provided
-   *
-   * \return Status::OK if success, Status::ERROR otherwise
-   */
-  Status precheck() override;
-
-  STEP_NAME(KillRscApps)
-};
-
-}  // namespace pkgmgr
-}  // namespace rpk
-
-#endif  // STEP_PKGMGR_STEP_KILL_RSCAPPS_H_