From b3f1603f0e6f35189e746ac3c53fcbd70194dd07 Mon Sep 17 00:00:00 2001 From: Joohyun Kim Date: Wed, 10 Apr 2013 21:57:48 +0900 Subject: [PATCH] Fix privilege Change-Id: I49b6b073e1b4c4a258aa5cf3a130d8fcd88ca4f6 Signed-off-by: Joohyun Kim --- inc/FSysSettingInfo.h | 10 +++++----- inc/FSysSystemInfo.h | 10 +++++----- src/system/FSysSettingInfo.cpp | 8 ++++---- src/system/FSysSystemInfo.cpp | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/inc/FSysSettingInfo.h b/inc/FSysSettingInfo.h index ab8bdd1..db0874c 100644 --- a/inc/FSysSettingInfo.h +++ b/inc/FSysSettingInfo.h @@ -355,7 +355,7 @@ public: * @since 2.0 * * @privlevel platform - * @privilege %http://tizen.org/privilege/systemsetting.read + * @privilege %http://tizen.org/privilege/settingmanager.read * * @return An error code * @param[in] key The key name of the setting information @@ -374,7 +374,7 @@ public: * @since 2.0 * * @privlevel platform - * @privilege %http://tizen.org/privilege/systemsetting.write + * @privilege %http://tizen.org/privilege/settingmanager.write * * @return An error code * @param[in] key The key name of the setting information @@ -393,7 +393,7 @@ public: * * @since 2.0 * @privlevel platform - * @privilege %http://tizen.org/privilege/systemsetting.write + * @privilege %http://tizen.org/privilege/settingmanager.write * * @return An error code * @param[in] key The key name of the setting information @@ -437,7 +437,7 @@ public: * @since 2.0 * * @privlevel platform - * @privilege %http://tizen.org/privilege/systemsetting.write + * @privilege %http://tizen.org/privilege/settingmanager.write * * @return An error code * @param[in] key The key name of the setting information @@ -458,7 +458,7 @@ public: * @since 2.0 * * @privlevel platform - * @privilege %http://tizen.org/privilege/systemsetting.write + * @privilege %http://tizen.org/privilege/settingmanager.write * * @return An error code * @exception E_SUCCESS The method is successful. diff --git a/inc/FSysSystemInfo.h b/inc/FSysSystemInfo.h index 5c8e8eb..3504067 100644 --- a/inc/FSysSystemInfo.h +++ b/inc/FSysSystemInfo.h @@ -212,7 +212,7 @@ public: * @since 2.0 * * @privlevel public - * @privilege %http://tizen.org/privilege/platforminfo + * @privilege %http://tizen.org/privilege/system * * @return An error code * @param[out] platformVersion The platform version @@ -228,7 +228,7 @@ public: * @since 2.0 * * @privlevel public - * @privilege %http://tizen.org/privilege/platforminfo + * @privilege %http://tizen.org/privilege/system * * @return An error code * @param[out] nativeApiVersion The Native API version @@ -244,7 +244,7 @@ public: * @since 2.0 * * @privlevel public - * @privilege %http://tizen.org/privilege/platforminfo + * @privilege %http://tizen.org/privilege/system * * @return An error code * @param[out] webApiVersion The %Tizen API version @@ -260,7 +260,7 @@ public: * @since 2.1 * * @privlevel public - * @privilege %http://tizen.org/privilege/platforminfo + * @privilege %http://tizen.org/privilege/system * * @return An error code * @param[out] buildInfo The %Tizen build information @@ -276,7 +276,7 @@ public: * @since 2.0 * * @privlevel partner - * @privilege %http://tizen.org/privilege/useridentity + * @privilege %http://tizen.org/privilege/systemmanager * * @return An error code * @param[out] imei The IMEI of the device diff --git a/src/system/FSysSettingInfo.cpp b/src/system/FSysSettingInfo.cpp index 3857712..67bcdb7 100644 --- a/src/system/FSysSettingInfo.cpp +++ b/src/system/FSysSettingInfo.cpp @@ -127,7 +127,7 @@ result SettingInfo::GetValueForPrivilegedKey(const String& key, bool& value) { result r = E_SUCCESS; - r = _AccessController::CheckUserPrivilege(_PRV_SYSTEMSETTING_READ); + r = _AccessController::CheckUserPrivilege(_PRV_SETTINGMANAGER_READ); SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.")); return _SettingInfoImpl::GetValueForPrivilegedKey(key, value); } @@ -169,7 +169,7 @@ result SettingInfo::SetValueForPrivilegedKey(const String& key, bool value) { result r = E_SUCCESS; - r = _AccessController::CheckUserPrivilege(_PRV_SYSTEMSETTING_WRITE); + r = _AccessController::CheckUserPrivilege(_PRV_SETTINGMANAGER_WRITE); SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.")); return _SettingInfoImpl::SetValueForPrivilegedKey(key, value); } @@ -178,7 +178,7 @@ result SettingInfo::SetValueForPrivilegedKey(const String& key, String value) { result r = E_SUCCESS; - r = _AccessController::CheckUserPrivilege(_PRV_SYSTEMSETTING_WRITE); + r = _AccessController::CheckUserPrivilege(_PRV_SETTINGMANAGER_WRITE); SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.")); return _SettingInfoImpl::SetValueForPrivilegedKey(key, value); } @@ -187,7 +187,7 @@ result SettingInfo::ResetToFactoryDefault(void) { result r = E_SUCCESS; - r = _AccessController::CheckUserPrivilege(_PRV_SYSTEMSETTING_WRITE); + r = _AccessController::CheckUserPrivilege(_PRV_SETTINGMANAGER_WRITE); SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.")); return _SettingInfoImpl::ResetToFactoryDefault(); } diff --git a/src/system/FSysSystemInfo.cpp b/src/system/FSysSystemInfo.cpp index ef5f86a..aa22a4b 100644 --- a/src/system/FSysSystemInfo.cpp +++ b/src/system/FSysSystemInfo.cpp @@ -109,7 +109,7 @@ CATCH: result SystemInfo::GetPlatformVersion(String& platformVersion) { - result r = _AccessController::CheckUserPrivilege(_PRV_PLATFORMINFO); + result r = _AccessController::CheckUserPrivilege(_PRV_SYSTEM); SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.")); return _SystemInfoImpl::GetPlatformVersion(platformVersion); } @@ -117,7 +117,7 @@ SystemInfo::GetPlatformVersion(String& platformVersion) result SystemInfo::GetBuildInfo(String& buildInfo) { - result r = _AccessController::CheckUserPrivilege(_PRV_PLATFORMINFO); + result r = _AccessController::CheckUserPrivilege(_PRV_SYSTEM); SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.")); return _SystemInfoImpl::GetBuildInfo(buildInfo); } @@ -125,7 +125,7 @@ SystemInfo::GetBuildInfo(String& buildInfo) result SystemInfo::GetNativeApiVersion(String& nativeApiVersion) { - result r = _AccessController::CheckUserPrivilege(_PRV_PLATFORMINFO); + result r = _AccessController::CheckUserPrivilege(_PRV_SYSTEM); SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.")); return _SystemInfoImpl::GetNativeApiVersion(nativeApiVersion); } @@ -133,7 +133,7 @@ SystemInfo::GetNativeApiVersion(String& nativeApiVersion) result SystemInfo::GetWebApiVersion(String& webApiVersion) { - result r = _AccessController::CheckUserPrivilege(_PRV_PLATFORMINFO); + result r = _AccessController::CheckUserPrivilege(_PRV_SYSTEM); SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.")); return _SystemInfoImpl::GetWebApiVersion(webApiVersion); } -- 2.7.4