Revert "Locking launching of widget during reinstallation/uninstallation"

Launch is blocked by reinstallation or deinstallation
For this reason, the app is not launched.
Please check again it and make a commit.

This reverts commit 3b7e85cfbc7948b0327cba3b827d9efd9a131d53.

Change-Id: I809195fcad5246f0a5a6d9230813896e26c580b2

diff --git a/src/jobs/widget_install/task_configuration.cpp b/src/jobs/widget_install/task_configuration.cpp
index 5f79d4a..bec432c 100644 (file)
--- a/src/jobs/widget_install/task_configuration.cpp
+++ b/src/jobs/widget_install/task_configuration.cpp
@@ -105,7 +105,6 @@ TaskConfiguration::TaskConfiguration(InstallerContext& context) :
     AddStep(&TaskConfiguration::ParseXMLConfigStep);
 
     AddStep(&TaskConfiguration::TizenIdStep);
-    AddStep(&TaskConfiguration::LockInstallationStep);
     AddStep(&TaskConfiguration::CheckAppRunningStateStep);
     AddStep(&TaskConfiguration::ApplicationTypeStep);
     AddStep(&TaskConfiguration::ResourceEncryptionStep);
@@ -291,14 +290,6 @@ void TaskConfiguration::TizenIdStep()
     _D("Tizen Pkg Id : %ls", (m_context.widgetConfig.tzPkgid).c_str());
 }
 
-void TaskConfiguration::LockInstallationStep()
-{
-    std::string lockString = DPL::ToUTF8String(m_context.widgetConfig.tzAppid);
-    _D("Locking installation on file '%s'", lockString.c_str());
-    m_context.installationLock.reset(new DPL::FileBasedMutex(lockString));
-    _D("Installation locked");
-}
-
 void TaskConfiguration::CheckAppRunningStateStep()
 {
     bool isRunning = false;

diff --git a/src/jobs/widget_install/task_configuration.h b/src/jobs/widget_install/task_configuration.h
index 1b81c20..0540ab7 100644 (file)
--- a/src/jobs/widget_install/task_configuration.h
+++ b/src/jobs/widget_install/task_configuration.h
@@ -73,7 +73,6 @@ class TaskConfiguration : public DPL::TaskDecl<TaskConfiguration>
     void ParseXMLConfigStep();
 
     void TizenIdStep();
-    void LockInstallationStep();
     void CheckAppRunningStateStep();
     void DetectUpdateInstallationStep();
     void PkgmgrStartStep();

diff --git a/src/jobs/widget_install/widget_install_context.h b/src/jobs/widget_install/widget_install_context.h
index 77ef647..4816e94 100644 (file)
--- a/src/jobs/widget_install/widget_install_context.h
+++ b/src/jobs/widget_install/widget_install_context.h
@@ -24,19 +24,14 @@
 
 #include <map>
 #include <string>
-#include <memory>
-
 #include <dpl/string.h>
 #include <dpl/wrt-dao-rw/widget_dao.h>
-#include <dpl/file_lock.h>
-
 #include <widget_install/widget_security.h>
 #include <feature_logic.h>
 #include <widget_install/widget_update_info.h>
 #include <widget_location.h>
 #include <wrt_install_mode.h>
 
-
 namespace Jobs {
 namespace WidgetInstall {
 class JobWidgetInstall;
@@ -106,8 +101,6 @@ struct InstallerContext
 
     std::string requestedPath; ///input path of widget
     bool needEncryption;  ///for configuring right task if encryption needed
-
-    std::unique_ptr<DPL::FileBasedMutex> installationLock;
 };
 
 #endif // INSTALLER_CONTEXT_H

diff --git a/src/jobs/widget_uninstall/task_check.cpp b/src/jobs/widget_uninstall/task_check.cpp
index 5baaaae..22a7e91 100644 (file)
--- a/src/jobs/widget_uninstall/task_check.cpp
+++ b/src/jobs/widget_uninstall/task_check.cpp
@@ -27,7 +27,6 @@
 #include <widget_uninstall/widget_uninstall_errors.h>
 #include <dpl/wrt-dao-ro/global_config.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
-#include <dpl/file_lock.h>
 #include <app_manager.h>
 #include <pkgmgr/pkgmgr_parser.h>
 #include <pkgmgr-info.h>
@@ -40,7 +39,6 @@ TaskCheck::TaskCheck(UninstallerContext& context) :
     m_context(context)
 {
     AddStep(&TaskCheck::StartStep);
-    AddStep(&TaskCheck::SetUninstallationLockStep);
     AddStep(&TaskCheck::StepUninstallPreCheck);
     AddStep(&TaskCheck::StepCheckMDM);
     AddStep(&TaskCheck::EndStep);
@@ -61,14 +59,6 @@ void TaskCheck::EndStep()
     _D("--------- <TaskCheck> : END ----------");
 }
 
-void TaskCheck::SetUninstallationLockStep()
-{
-    std::string lockString = m_context.tzAppid;
-    _D("Locking uninstallation on file '%s'", lockString.c_str());
-    m_context.installationLock.reset(new DPL::FileBasedMutex(lockString));
-    _D("Uninstallation locked");
-}
-
 void TaskCheck::StepUninstallPreCheck()
 {
     bool isRunning = false;

diff --git a/src/jobs/widget_uninstall/task_check.h b/src/jobs/widget_uninstall/task_check.h
index 933c813..29c00db 100644 (file)
--- a/src/jobs/widget_uninstall/task_check.h
+++ b/src/jobs/widget_uninstall/task_check.h
@@ -38,7 +38,6 @@ class TaskCheck :
     UninstallerContext& m_context;
 
     //steps
-    void SetUninstallationLockStep();
     void StepUninstallPreCheck();
     void StepCheckMDM();
     void StartStep();

diff --git a/src/jobs/widget_uninstall/uninstaller_context.h b/src/jobs/widget_uninstall/uninstaller_context.h
index 0ba3778..b6cf5bd 100644 (file)
--- a/src/jobs/widget_uninstall/uninstaller_context.h
+++ b/src/jobs/widget_uninstall/uninstaller_context.h
@@ -27,7 +27,6 @@
 #include <widget_uninstall/widget_uninstaller_struct.h>
 #include <widget_location.h>
 #include <dpl/utils/path.h>
-#include <dpl/file_lock.h>
 
 namespace Jobs {
 namespace WidgetUninstall {
@@ -66,8 +65,6 @@ struct UninstallerContext
     bool removeAbnormal;
     DPL::Utils::Path installedPath;
     DPL::Utils::Path manifestFile;
-
-    std::unique_ptr<DPL::FileBasedMutex> installationLock;
 };
 
 #endif // WRT_SRC_INSTALLER_CORE_UNINSTALLER_TASKS_UNINSTALLER_CONTEXT_H_