merge with master

1 files changed, 13 insertions, 11 deletions

diff --git a/inc/FLocLocationProvider.h b/inc/FLocLocationProvider.h
index 33a6c60..9b88f1b 100755..100644
--- a/inc/FLocLocationProvider.h
+++ b/inc/FLocLocationProvider.h
@@ -114,7 +114,8 @@ public:
 	* the location provider cancels the prior request and restarts the updates with the specified parameter.
 	*
 	* @since 2.0
-	* @privilege %http://tizen.org/privilege/location
+	* @privlevel	public
+	* @privilege http://tizen.org/privilege/location
 	*
 	* @return	An error code
 	* @param[in]	interval	The update interval in seconds
@@ -149,7 +150,8 @@ public:
 	* the location provider cancels the prior request and restarts the updates with the specified parameter.
 	*
 	* @since 2.0
-	* @privilege %http://tizen.org/privilege/location
+	* @privlevel	public
+	* @privilege http://tizen.org/privilege/location
 	*
 	* @return	An error code
 	* @param[in]	distance	The distance in meters
@@ -188,7 +190,8 @@ public:
 	* during the location updates.
 	*
 	* @since 2.0
-	* @privilege %http://tizen.org/privilege/location and %http://tizen.org/privilege/power @n
+	* @privlevel	public
+	* @privilege http://tizen.org/privilege/location and http://tizen.org/privilege/power @n
 	*				Both privileges are required.
 	*
 	* @return	An error code
@@ -218,7 +221,8 @@ public:
 	* Note that, the monitoring service can sometimes makes the system awake by running costly positioning devices.
 	*
 	* @since 2.0
-	* @privilege %http://tizen.org/privilege/location and %http://tizen.org/privilege/power @n
+	* @privlevel	public
+	* @privilege http://tizen.org/privilege/location and http://tizen.org/privilege/power @n
 	*				Both privileges are required.
 	*
 	* @return	An error code
@@ -303,7 +307,8 @@ public:
 	* an invalid location with an @c E_LOCATION_UNAVAILABLE error.
 	*
 	* @since 2.0
-	* @privilege %http://tizen.org/privilege/location
+	* @privlevel	public
+	* @privilege http://tizen.org/privilege/location
 	*
 	* @return	The current location
 	* @param[in]	criteria	The desired location criteria
@@ -313,11 +318,7 @@ public:
 	* @exception	E_USER_NOT_CONSENTED	The user blocks an application from using the location information.
 	* @exception	E_SYSTEM	A system error has occurred.
 	* @remarks	This method call takes time as the location provider runs and waits for positioning system.
-	*			If the method is called from the application's main thread, it makes the application unresponsive until it returns.
-	*			If an application wants to be responsive, especially within the user interaction, it should use this method
-	*			in a separated thread using Tizen::Base::Runtime::Thread class,
-	*			rather than in the application's main thread which handles the ui events.
-	* @remarks	The specific error code can be accessed using the GetLastResult() method.
+	* @remarks     The specific error code can be accessed using the GetLastResult() method.
 	*/
 	static Location GetLocation(const LocationCriteria& criteria);
 
@@ -329,7 +330,8 @@ public:
 	* since using the last location preserves the location provider from running costly positioning systems.
 	*
 	* @since 2.0
-	* @privilege %http://tizen.org/privilege/location
+	* @privlevel	public
+	* @privilege http://tizen.org/privilege/location
 	*
 	* @return	The last location
 	* @exception	E_SUCCESS	The method is successful.