Minor improvements for force-uninstall step

Change-Id: Ide952d967df1978cff123b14c2375557155031b9

diff --git a/src/wgt/step/step_remove_encryption_data.cc b/src/wgt/step/step_remove_encryption_data.cc
index 452f32b..0c601d3 100644 (file)
--- a/src/wgt/step/step_remove_encryption_data.cc
+++ b/src/wgt/step/step_remove_encryption_data.cc
@@ -11,7 +11,7 @@
 namespace wgt {
 namespace encrypt {
 
-common_installer::Step::Status StepRemoveEncryptionData::clean() {
+common_installer::Step::Status StepRemoveEncryptionData::process() {
   wae_app_type_e enc_type =
       context_->request_mode.get() == common_installer::RequestMode::GLOBAL ?
           WAE_DOWNLOADED_GLOBAL_APP : WAE_DOWNLOADED_NORMAL_APP;

diff --git a/src/wgt/step/step_remove_encryption_data.h b/src/wgt/step/step_remove_encryption_data.h
index 291b92e..6156e99 100644 (file)
--- a/src/wgt/step/step_remove_encryption_data.h
+++ b/src/wgt/step/step_remove_encryption_data.h
@@ -22,36 +22,18 @@ class StepRemoveEncryptionData : public common_installer::Step {
   using Step::Step;
 
   /**
-   * \brief Empty method - the actual work is done in clean() to delay it
-   *
-   * \return Status::OK
-   */
-  Status process() override { return Status::OK; }
-
-  /**
    * \brief Remove encryption keys from database
    *
-   * \return Status::ERROR in case of failure,
-   *         Status::OK otherwise
-   */
-  Status clean() override;
-
-  /**
-   * \brief Empty method
-   *
    * \return Status::OK
    */
+  Status process() override;
+  Status clean() override { return Status::OK; }
   Status undo() override { return Status::OK; }
-
-  /**
-   * \brief Empty method
-   *
-   * \return Status::OK
-   */
   Status precheck() override { return Status::OK; }
 
   SCOPE_LOG_TAG(RemoveEncryptionData)
 };
 }  // namespace encrypt
 }  // namespace wgt
+
 #endif  // WGT_STEP_STEP_REMOVE_ENCRYPTION_DATA_H_