From: Yoonsoo Kim <ys71.kim@samsung.com>
Date: Thu, 18 Apr 2013 08:04:01 +0000 (+0900)
Subject: Merge "Revert " Manage when the string length is zero"" into tizen_2.1
X-Git-Tag: accepted/tizen_2.1/20130425.034849~37^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac74901f378ef40b5f1e7c7cbd133e48cb94069e;hp=0a38ca8fa036f2335a3a5088cc89abf36992d6f4;p=platform%2Fframework%2Fnative%2Fappfw.git

Merge "Revert " Manage when the string length is zero"" into tizen_2.1
---

diff --git a/inc/FSysSettingInfo.h b/inc/FSysSettingInfo.h
index f5bf83e..c39420a 100644
--- a/inc/FSysSettingInfo.h
+++ b/inc/FSysSettingInfo.h
@@ -355,7 +355,7 @@ public:
 	 * @since 2.0
 	 *
 	 * @privlevel	platform
-	 * @privilege	%http://tizen.org/privilege/settingmanager.read
+	 * @privilege	%http://tizen.org/privilege/settingmanager.read @n
 	 *		(%http://tizen.org/privilege/systemsetting.read is deprecated.)
 	 *
 	 * @return	An error code
@@ -375,7 +375,7 @@ public:
 	 * @since 2.0
 	 *
 	 * @privlevel	platform
-	 * @privilege	%http://tizen.org/privilege/settingmanager.write
+	 * @privilege	%http://tizen.org/privilege/settingmanager.write @n
 	 *		(%http://tizen.org/privilege/systemsetting.write is deprecated.)
 	 *
 	 * @return	An error code
@@ -395,7 +395,7 @@ public:
 	 *
 	 * @since 2.0
 	 * @privlevel	platform
-	 * @privilege	%http://tizen.org/privilege/settingmanager.write
+	 * @privilege	%http://tizen.org/privilege/settingmanager.write @n
 	 *		(%http://tizen.org/privilege/systemsetting.write is deprecated.)
 	 *
 	 * @return	An error code
@@ -408,12 +408,16 @@ public:
 	 * @exception	E_OBJ_NOT_FOUND		The specified @c key is not found.
 	 * @exception	E_UNSUPPORTED_OPERATION	The specified @c key is existed, However it is not supported by this device.
 	 * @exception	E_IN_PROGRESS		The specified key is under processing or invalid state.
-	 * @exception	E_SYSTEM		The method cannot proceed due to a severe system error.
+	 * @exception	E_SYSTEM		Either of the following conditions has occured:
+	 *					- The method cannot proceed due to a severe system error.
+	 *					- It can be occurred and Wi-Fi Direct™ is not activated if the @c key is %http://tizen.org/setting/network.wifi.direct and Wi-Fi is activated.-
+Direct™ is not activated if the @c key is %http://tizen.org/setting/network.wifi.direct and Wi-Fi is activated.
+
 	 */
 	static result SetValueAsyncForPrivilegedKey(const Tizen::Base::String& key, bool value, ISettingInfoSetValueAsyncResultListener* listener);
 
 	/**
-	 * Sets the specific @c bool type sett	 * @exception	E_IN_PROGRESS		The specified key is under processing or invalid state.ing information based on the specified designators (key) asynchronously.
+	 * Sets the specific @c bool type setting information based on the specified designators (key) asynchronously.
 	 *
 	 * @since 2.0
 	 * @privlevel	platform
@@ -440,7 +444,7 @@ public:
 	 * @since 2.0
 	 *
 	 * @privlevel	platform
-	 * @privilege	%http://tizen.org/privilege/settingmanager.write
+	 * @privilege	%http://tizen.org/privilege/settingmanager.write @n
 	 *		(%http://tizen.org/privilege/systemsetting.write is deprecated.)
 	 *
 	 * @return	An error code
@@ -462,7 +466,7 @@ public:
 	 * @since 2.0
 	 *
 	 * @privlevel	platform
-	 * @privilege	%http://tizen.org/privilege/settingmanager.write
+	 * @privilege	%http://tizen.org/privilege/settingmanager.write @n
 	 *		(%http://tizen.org/privilege/systemsetting.write is deprecated.)
 	 *
 	 * @return	An error code
diff --git a/inc/FSysSystemInfo.h b/inc/FSysSystemInfo.h
index 6700847..6490d2e 100644
--- a/inc/FSysSystemInfo.h
+++ b/inc/FSysSystemInfo.h
@@ -212,8 +212,8 @@ public:
 	 * @since 2.0
 	 *
 	 * @privlevel	public
-	 * @privilege	%http://tizen.org/privilege/system
-	 * 		(%http://tizen.org/privilege/platforminfo is deprecated.)
+	 * @privilege	%http://tizen.org/privilege/system @n
+	 *		(%http://tizen.org/privilege/platforminfo is deprecated.)
 	 *
 	 * @return	An error code
 	 * @param[out]	platformVersion		The platform version
@@ -229,8 +229,8 @@ public:
 	 * @since 2.0
 	 *
 	 * @privlevel	public
-	 * @privilege	%http://tizen.org/privilege/system
-	 * 		(%http://tizen.org/privilege/platforminfo is deprecated.)
+	 * @privilege	%http://tizen.org/privilege/system @n
+	 *		(%http://tizen.org/privilege/platforminfo is deprecated.)
 	 *
 	 * @return	An error code
 	 * @param[out]	nativeApiVersion	The Native API version
@@ -246,8 +246,8 @@ public:
 	 * @since 2.0
 	 *
 	 * @privlevel	public
-	 * @privilege	%http://tizen.org/privilege/system
-	 * 		(%http://tizen.org/privilege/platforminfo is deprecated.)
+	 * @privilege	%http://tizen.org/privilege/system @n
+	 *		(%http://tizen.org/privilege/platforminfo is deprecated.)
 	 *
 	 * @return	An error code
 	 * @param[out]	webApiVersion		The %Tizen API version
@@ -263,8 +263,8 @@ public:
 	 * @since 2.1
 	 *
 	 * @privlevel	public
-	 * @privilege	%http://tizen.org/privilege/system
-	 * 		(%http://tizen.org/privilege/platforminfo is deprecated.)
+	 * @privilege	%http://tizen.org/privilege/system @n
+	 *		(%http://tizen.org/privilege/platforminfo is deprecated.)
 	 *
 	 * @return	An error code
 	 * @param[out]	buildInfo		The %Tizen build information
@@ -280,8 +280,8 @@ public:
 	 * @since	2.0
 	 *
 	 * @privlevel	partner
-	 * @privilege	%http://tizen.org/privilege/systemmanager
-	 * 		(%http://tizen.org/privilege/useridentity is deprecated.)
+	 * @privilege	%http://tizen.org/privilege/systemmanager @n
+	 *		(%http://tizen.org/privilege/useridentity is deprecated.)
 	 *
 	 * @return	An error code
 	 * @param[out]	imei			The IMEI of the device
diff --git a/inc/FSysSystemTime.h b/inc/FSysSystemTime.h
index f80ddbd..ba674cc 100644
--- a/inc/FSysSystemTime.h
+++ b/inc/FSysSystemTime.h
@@ -118,7 +118,8 @@ public:
 	 * @since 2.0
 	 *
 	 * @privlevel	platform
-	 * @privilege	%http://tizen.org/privilege/systemsetting.write
+	 * @privilege	%http://tizen.org/privilege/settingmanager.write @n
+	 *		(%http://tizen.org/privilege/systemsetting.write is deprecated.)
 	 *
 	 * @return	An error code
 	 * @param[in]	currentTime		The current system time in UTC