Sync with tizen_2.2

1. Fix bugs
2. Check security policy
3. Update smack api

Change-Id: I17ddf44576f31a697201327f178e90d4e6d0985b
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index 9b05d0b..7a42b8e 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130828.1]"
+#define OSP_INSTALLER_VERSION "version=[20130828.2]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/src/Manager/ConfigurationManager.cpp b/src/Manager/ConfigurationManager.cpp
index 65c51f9..586815f 100755 (executable)
--- a/src/Manager/ConfigurationManager.cpp
+++ b/src/Manager/ConfigurationManager.cpp
@@ -554,6 +554,7 @@ ConfigurationManager::CopyData(InstallationContext* pContext) const
        rootPath += packageId;
 
        backupPath = rootPath + BACKUP_NAME_RULE;
+       TryReturn(File::IsFileExist(backupPath) == true, false, "backupPath[%ls] is not found.", backupPath.GetPointer());
 
        // data
        srcPath = backupPath + DIR_DATA;

diff --git a/src/Step/SystemCheckStep.cpp b/src/Step/SystemCheckStep.cpp
index 98b85b6..ce923ed 100755 (executable)
--- a/src/Step/SystemCheckStep.cpp
+++ b/src/Step/SystemCheckStep.cpp
@@ -27,7 +27,6 @@
 
 #include "InstallationContext.h"
 #include "SystemCheckStep.h"
-#include "ConfigurationManager.h"
 #include "DatabaseManager.h"
 
 using namespace Tizen::App;
@@ -36,7 +35,7 @@ using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 
 SystemCheckStep::SystemCheckStep(void)
-:__state(STATE_POLICY_CHECK)
+:__state(STATE_VERSION_CHECK)
 ,__pContext(null)
 {
 }
@@ -56,18 +55,10 @@ SystemCheckStep::Run(InstallationContext* pContext)
        {
                switch (__state)
                {
-               case STATE_POLICY_CHECK:
-                       error = OnStatePolicyCheck();
-                       break;
-
                case STATE_VERSION_CHECK:
                        error = OnStateVersionCheck();
                        break;
 
-               case STATE_BACKUP:
-                       error = OnStateBackup();
-                       break;
-
                case STATE_DONE:
                        error = OnStateDone();
                        break;
@@ -97,15 +88,6 @@ SystemCheckStep::GoNextState(void)
 }
 
 InstallerError
-SystemCheckStep::OnStatePolicyCheck(void)
-{
-       InstallerError error = INSTALLER_ERROR_NONE;
-
-       GoNextState();
-       return error;
-}
-
-InstallerError
 SystemCheckStep::OnStateVersionCheck(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
@@ -178,22 +160,6 @@ SystemCheckStep::OnStateVersionCheck(void)
 }
 
 InstallerError
-SystemCheckStep::OnStateBackup(void)
-{
-       InstallerError error = INSTALLER_ERROR_NONE;
-
-       if ((__pContext->__isUpdated == true) && (__pContext->__isPreloaded == false))
-       {
-               ConfigurationManager configurationManager;
-               bool res = configurationManager.CreateBackup(__pContext);
-               TryReturn(res == true, INSTALLER_ERROR_BACKUP_FAILED, "configurationManager.CreateBackup(%ls) failed.", __pContext->__packageId.GetPointer());
-       }
-
-       GoNextState();
-       return error;
-}
-
-InstallerError
 SystemCheckStep::OnStateDone(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;

diff --git a/src/Step/SystemCheckStep.h b/src/Step/SystemCheckStep.h
index c09adcd..6735090 100755 (executable)
--- a/src/Step/SystemCheckStep.h
+++ b/src/Step/SystemCheckStep.h
@@ -45,9 +45,7 @@ public:
 private:
        enum
        {
-               STATE_POLICY_CHECK,
                STATE_VERSION_CHECK,
-               STATE_BACKUP,
                STATE_DONE
        };
 
@@ -60,9 +58,7 @@ private:
        };
 
        void GoNextState(void);
-       InstallerError OnStatePolicyCheck(void);
        InstallerError OnStateVersionCheck(void);
-       InstallerError OnStateBackup(void);
        InstallerError OnStateDone(void);
 
        int CompareVersion(const Tizen::Base::String& oldVersion, const Tizen::Base::String& newVersion);

diff --git a/src/Step/UnpackStep.cpp b/src/Step/UnpackStep.cpp
index 40c33e1..386538e 100755 (executable)
--- a/src/Step/UnpackStep.cpp
+++ b/src/Step/UnpackStep.cpp
@@ -31,6 +31,7 @@
 #include "InstallationContext.h"
 #include "UnpackStep.h"
 #include "InstallerUtil.h"
+#include "ConfigurationManager.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
@@ -39,7 +40,7 @@ using namespace Tizen::Base::Utility;
 using namespace Tizen::Io;
 
 UnpackStep::UnpackStep(void)
-:__state(STATE_UNZIP)
+:__state(STATE_BACKUP)
 ,__pContext(null)
 ,__pDirectoryList(null)
 ,__uncompressedSize(0)
@@ -79,6 +80,11 @@ UnpackStep::Run(InstallationContext* pContext)
        {
                switch (__state)
                {
+               case STATE_BACKUP:
+                       AppLog("[STATE_BACKUP]");
+                       error = OnStateBackup();
+                       break;
+
                case STATE_UNZIP:
                        AppLog("[STATE_UNZIP]");
                        error = OnUnzip();
@@ -125,6 +131,22 @@ UnpackStep::GoNextState(void)
 }
 
 InstallerError
+UnpackStep::OnStateBackup(void)
+{
+       InstallerError error = INSTALLER_ERROR_NONE;
+
+       if ((__pContext->__isUpdated == true) && (__pContext->__isPreloaded == false))
+       {
+               ConfigurationManager configurationManager;
+               bool res = configurationManager.CreateBackup(__pContext);
+               TryReturn(res == true, INSTALLER_ERROR_BACKUP_FAILED, "configurationManager.CreateBackup(%ls) failed.", __pContext->__packageId.GetPointer());
+       }
+
+       GoNextState();
+       return error;
+}
+
+InstallerError
 UnpackStep::OnUnzip(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;

diff --git a/src/Step/UnpackStep.h b/src/Step/UnpackStep.h
index 08c5d02..36fb931 100755 (executable)
--- a/src/Step/UnpackStep.h
+++ b/src/Step/UnpackStep.h
@@ -47,6 +47,7 @@ public:
 private:
        enum
        {
+               STATE_BACKUP,
                STATE_UNZIP,
                STATE_FILE_MOVE,
                STATE_CREATE_DIR,
@@ -54,6 +55,7 @@ private:
        };
 
        void GoNextState(void);
+       InstallerError OnStateBackup(void);
        InstallerError OnUnzip(void);
        InstallerError OnStateFileMove(void);
        InstallerError OnCreateDir(void);