Merge "Remove build warning and add temporary getter of privacy name" into tizen_2.1

diff --git a/src/security/FSec_PrivacyInfoImpl.cpp b/src/security/FSec_PrivacyInfoImpl.cpp
index b445db8..e929e6a 100755 (executable)
--- a/src/security/FSec_PrivacyInfoImpl.cpp
+++ b/src/security/FSec_PrivacyInfoImpl.cpp
@@ -76,7 +76,12 @@ _PrivacyInfoImpl::SetEnabled(bool enable)
 String
 _PrivacyInfoImpl::GetDisplayName(void) const
 {
-       return __privacyId;
+       String privacyURI = L"http://tizen.org/privacy/";
+       String displayName;
+
+       __privacyId.SubString(privacyURI.GetLength(), displayName);
+
+       return displayName;
 }
 
 String

diff --git a/src/security/FSec_PrivacyManagerImpl.cpp b/src/security/FSec_PrivacyManagerImpl.cpp
index 7944b4e..1d333a6 100755 (executable)
--- a/src/security/FSec_PrivacyManagerImpl.cpp
+++ b/src/security/FSec_PrivacyManagerImpl.cpp
@@ -54,7 +54,6 @@ _PrivacyManagerImpl::GetInstance(PrivacyManager& privacyManager)
 
 bool GetPrivacyAppPackageListNCallback(const char *package_id, void* user_data)
 {
-       result r = E_SUCCESS;
        ArrayList* pList = static_cast < ArrayList* >(user_data);
 
        pList->Add(new String(package_id));