Add smack label for preloaded app

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

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index 8cd8579..21aadab 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130510.1]"
+#define OSP_INSTALLER_VERSION "version=[20130510.2]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/src/Manager/PermissionManager.cpp b/src/Manager/PermissionManager.cpp
index d5903b7..fb88202 100755 (executable)
--- a/src/Manager/PermissionManager.cpp
+++ b/src/Manager/PermissionManager.cpp
@@ -66,6 +66,15 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
        InstallerUtil::ChangeMode(appRootPath, PERM_BASE | PERM_EXECUTE);
        smackManager.AddLabelDir(packageId, appRootPath, true);
 
+       if (pContext->__isPreloaded == true)
+       {
+               String preloadedAppPath(PATH_USR_APPS);
+               preloadedAppPath += L"/";
+               preloadedAppPath += packageId;
+
+               smackManager.AddLabelDir(L"_", preloadedAppPath, true);
+       }
+
        // appRoot/bin
        destPath = appRootPath + DIR_BIN;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE | PERM_EXECUTE, false);

diff --git a/src/XmlHandler/ManifestGenerator.cpp b/src/XmlHandler/ManifestGenerator.cpp
index e4b56f6..0f048f6 100755 (executable)
--- a/src/XmlHandler/ManifestGenerator.cpp
+++ b/src/XmlHandler/ManifestGenerator.cpp
@@ -589,6 +589,11 @@ ManifestGenerator::WriteApp(int index, AppData* pAppData)
        __pWriter->WriteAttribute("hw-acceleration", glFrame);
        __pWriter->WriteAttribute("mainapp", mainapp);
 
+       if (pAppData->__pLaunchConditionList->GetCount() > 0)
+       {
+               __pWriter->WriteAttribute("launchcondition", "true");
+       }
+
        if (pAppData->__permissionType.IsEmpty() == false)
        {
                String type = pAppData->__permissionType;