Modify smack label for osp-compat

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

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index ccb23b5..95dff7c 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130703.1]"
+#define OSP_INSTALLER_VERSION "version=[20130703.2]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"
@@ -126,6 +126,7 @@
 #define METADATA_SPLASH_INDICATOR_DISPLAY              L"http://developer.samsung.com/tizen/metadata/splash/indicatordisplay"
 #define METADATA_SPLASH_PORTRAIT                               L"http://developer.samsung.com/tizen/metadata/splash/portrait"
 #define METADATA_SPLASH_LANDSCAPE                              L"http://developer.samsung.com/tizen/metadata/splash/landscape"
+#define METADATA_DISABLE_SCREEN_READER L"http://developer.samsung.com/tizen/metadata/disablescreenreader"
 
 #define DIR_APPLICATIONS_TMP                                   "/opt/usr/apps/tmp"
 

diff --git a/src/Manager/PermissionManager.cpp b/src/Manager/PermissionManager.cpp
index 5967f8d..ea8ee6d 100755 (executable)
--- a/src/Manager/PermissionManager.cpp
+++ b/src/Manager/PermissionManager.cpp
@@ -236,9 +236,7 @@ PermissionManager::SetSymLink(InstallationContext* pContext)
        InstallerUtil::CreateSymlink(oldPath, newPath);
 #else
        newPath = appRootPath + L"/Res";
-       std::unique_ptr< char[] > pResPath(_StringConverter::CopyToCharArrayN(newPath));
-       int ret = symlink("./res", pResPath.get());
-       smackManager.SetupPath(pContext->__packageId, newPath, SMACK_DIR_TYPE_ANY_LABEL, L"_");
+       InstallerUtil::CreateSymlink(L"./res", newPath, false);
 #endif
 
 #if 0
@@ -247,9 +245,7 @@ PermissionManager::SetSymLink(InstallationContext* pContext)
        InstallerUtil::CreateSymlink(oldPath, newPath);
 #else
        newPath = appRootPath + L"/Home";
-       std::unique_ptr< char[] > pHomePath(_StringConverter::CopyToCharArrayN(newPath));
-       ret = symlink("./data", pHomePath.get());
-       smackManager.SetupPath(pContext->__packageId, newPath, SMACK_DIR_TYPE_ANY_LABEL, L"_");
+       InstallerUtil::CreateSymlink(L"./data", newPath, false);
 #endif
 
        oldPath = appRootPath + DIR_RES + L"/screen-size-normal";

diff --git a/src/XmlHandler/ManifestGenerator.cpp b/src/XmlHandler/ManifestGenerator.cpp
index d079608..39ee9cc 100755 (executable)
--- a/src/XmlHandler/ManifestGenerator.cpp
+++ b/src/XmlHandler/ManifestGenerator.cpp
@@ -580,6 +580,7 @@ bool
 ManifestGenerator::WriteApp(int index, AppData* pAppData)
 {
        IMap* pNameList = pAppData->__pNameList;
+       HashMap* pMetadataMap = pAppData->__pMetadataMap;
        String label("label");
        String type("c++app");
        String binaryPath;
@@ -662,6 +663,12 @@ ManifestGenerator::WriteApp(int index, AppData* pAppData)
        __pWriter->WriteAttribute("hw-acceleration", glFrame);
        __pWriter->WriteAttribute("mainapp", mainapp);
 
+       String screenReaderOff(METADATA_DISABLE_SCREEN_READER);
+       if (pMetadataMap->ContainsKey(screenReaderOff) == true)
+       {
+               __pWriter->WriteAttribute(L"screen-reader", L"screenreader-off");
+       }
+
        String indicatorDisplay;
        String portraitValue;
        String landscapeValue;
@@ -694,7 +701,6 @@ ManifestGenerator::WriteApp(int index, AppData* pAppData)
                __pWriter->EndElement();
        }
 
-       HashMap* pMetadataMap = pAppData->__pMetadataMap;
        if (pMetadataMap->GetCount() > 0)
        {
                WriteMetadata(pMetadataMap);