Merge "[ACR-1646] Add location APIs to public header" into tizentizen_6.5.m2_releasesubmit/tizen_6.5/20211028.161801submit/tizen/20210910.135122submit/tizen/20210910.073452accepted/tizen/unified/20210914.053333accepted/tizen/6.5/unified/20211028.095025

9 files changed, 271 insertions, 367 deletions

diff --git a/doc/user-awareness-doc.h b/doc/user-awareness-doc.h
index b1ef0d0..eed0808 100644
--- a/doc/user-awareness-doc.h
+++ b/doc/user-awareness-doc.h
@@ -34,6 +34,7 @@
  * @section CAPI_NETWORK_UA_MODULE_FEATURE Related Features
  * This API is related with the following features:\n
  *  - %http://tizen.org/feature/user_awareness\n
+ *  - %http://tizen.org/feature/user_awareness.location\n
  *
  * It is recommended to design feature related codes in your application for reliability.\n
  *
diff --git a/include/user-awareness-internal-type.h b/include/user-awareness-internal-type.h
index 48a99b6..d43aab0 100755
--- a/include/user-awareness-internal-type.h
+++ b/include/user-awareness-internal-type.h
@@ -32,13 +32,6 @@ extern "C" {
 
 /**
  * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief The handle of location information.
- * @since_tizen 6.5
- */
-typedef void *ua_location_h;
-
-/**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Enumerations of logical conjunction operation in between
  *         AND and OR user detection conditions.
  * @since_tizen 6.5
@@ -70,55 +63,6 @@ typedef bool (*ua_registered_user_cb)(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Callback to be invoked on detection of user and device location.
- * Callback to be invoked once for each user/device in location callback
- * period set by ua_monitor_set_location_period()
- * @since_tizen 6.5
- *
- * @remarks The @a monitor handle should not be released.
- * @remarks The @a monitor handle can be used only in the callback.
- * @remarks The @a service handle should not be released
- * @remarks The @a service handle can be used only in the callback.
- * @remarks The @a sensor handle should not be released.
- * @remarks The @a sensor handle can be used only in the callback.
- * @remarks The @a device handle should not be released.
- * @remarks The @a device handle can be used only in the callback.
- * @remarks The @a user handle should not be released.
- * @remarks The @a user handle can be used only in the callback.
- * @remarks The @a location handle should not be released.
- * @remarks The @a location handle can be used only in the callback.
- *
- * @param[in] result The result error code of the requested operation.
- * result is #UA_ERROR_NONE on success, otherwise appropriate error value.
- * @details Following error codes can be delivered:
- * #UA_ERROR_NONE Successful.
- * #UA_ERROR_OPERATION_FAILED Operation failed
- *
- * @param[in] monitor The monitor handle
- * @param[in] service The service handle with which location detection start was invoked.
- * @param[in] sensor_type Sensor type
- * @param[in] sensor The handle of the sensor which reported user/device location.
- * @param[in] device The device handle on which sensor is detected.
- * @param[in] user The user handle on which sensor is detected.
- * @param[in] location The location handle.
- * @param[in] user_data The user data passed in ua_monitor_start_location_detection()
- *
- * @see ua_monitor_set_location_period()
- * @see ua_monitor_start_location_detection()
- */
-typedef void (*ua_location_detected_cb)(
-		ua_error_e result,
-		ua_monitor_h monitor,
-		ua_service_h service,
-		ua_sensor_type_e sensor_type,
-		ua_sensor_h sensor,
-		ua_device_h device,
-		ua_user_h user,
-		ua_location_h location,
-		void *user_data);
-
-/**
  * @}
  */
 
diff --git a/include/user-awareness-internal.h b/include/user-awareness-internal.h
index 69108c7..ea798a2 100755
--- a/include/user-awareness-internal.h
+++ b/include/user-awareness-internal.h
@@ -348,113 +348,6 @@ int ua_service_get_device_discriminant(
 		ua_device_h device,
 		bool *discriminant);
 
-/**
- * @internal
- * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Starts user location detection.
- * @since_tizen 6.5
- *
- * @param[in] monitor The monitor handle
- * @param[in] service The service handle. If service is NULL then monitor will start for default service.
- * @param[in] callback Callback to be invoked after device location detection.
- * @param[in] user_data The user data to be passed when callback is called.
- *
- * @return 0 on success, otherwise a negative error value
- * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
- * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #UA_ERROR_NOW_IN_PROGRESS Operation now in progress
- * @retval #UA_ERROR_NO_DATA No sensor available
- * @retval #UA_ERROR_OPERATION_FAILED Operation failed
- * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
- *
- * @see ua_location_detected_cb()
- * @see ua_monitor_set_location_period()
- * @see ua_monitor_stop_location_detection()
- */
-int ua_monitor_start_location_detection(
-		ua_monitor_h monitor,
-		ua_service_h service,
-		ua_location_detected_cb callback,
-		void *user_data);
-
-/**
- * @internal
- * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Stops user location detection.
- * @since_tizen 6.5
- *
- * @param[in] monitor UA monitor's handle
- *
- * @return 0 on success, otherwise a negative error value
- * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
- * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #UA_ERROR_NOT_IN_PROGRESS Operation not in progress
- * @retval #UA_ERROR_OPERATION_FAILED Operation failed
- * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
- *
- * @see ua_monitor_start_location_detection()
- */
-int ua_monitor_stop_location_detection(
-			ua_monitor_h monitor);
-
-/**
- * @internal
- * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Gets the distance for the location handle.
- * @since_tizen 6.5
- *
- * @param[in] location handle Location handle for location information.
- * @param[out] distance distance of the detected device and user.
- *
- * @return 0 on success, otherwise a negative error value
- * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- */
-int ua_location_get_distance(ua_location_h location_handle, int *distance);
-
-/**
- * @internal
- * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Gets the position for the location handle.
- * @since_tizen 6.5
- *
- * @param[in] location handle Location handle for location information.
- * @param[out] x x-coordinate of the location.
- * @param[out] y y-coordinate of the location.
- * @param[out] z z-coordinate of the location.
- *
- * @return 0 on success, otherwise a negative error value
- * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- */
-int ua_location_get_position(ua_location_h location_handle,
-					int *x, int *y, int *z);
-
-/**
- * @internal
- * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Sets the location callback period in milli-seconds.
- * If location period is not set, it will be automatically
- * set to #UA_LOCATION_PERIOD_DEFAULT
- * @since_tizen 6.5
- *
- * @param[in] monitor handle
- * @param[out] location period
- *
- * @return 0 on success, otherwise a negative error value
- * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- */
-int ua_monitor_set_location_period(
-	ua_monitor_h monitor_handle, unsigned int location_period);
-
 /* Deprecated API's */
 
 /**
diff --git a/include/user-awareness-private.h b/include/user-awareness-private.h
index da65bbc..6bf2be7 100755
--- a/include/user-awareness-private.h
+++ b/include/user-awareness-private.h
@@ -146,6 +146,7 @@ extern "C" {
 typedef enum {
 	UA_FEATURE_BASE = 0,
 	UA_FEATURE_COMMON = UA_FEATURE_BASE,
+	UA_FEATURE_LOCATION,
 	UA_FEATURE_MAX
 } ua_feature_t;
 
@@ -204,36 +205,6 @@ do	{ \
 #define UA_BLE_PAYLOAD_DEVICE_UID_MAX_LEN 17
 
 /**
- * @brief Default location callback period (in msec).
- * @since_tizen 6.5
- */
-#define UA_LOCATION_PERIOD_DEFAULT 1000
-
-/**
- * @brief Wifi location sensor.
- * @since_tizen 6.5
- */
-#define UA_SENSOR_WIFI_LOCATION 0x00000040
-
-/**
- * @brief Wifi location mac type.
- * @since_tizen 6.5
- */
-#define UA_MAC_TYPE_WIFI_LOCATION 0x10
-
-/**
- * @brief UWB sensor.
- * @since_tizen 6.5
- */
-#define UA_SENSOR_UWB 0x00000080
-
-/**
- * @brief UWB mac type.
- * @since_tizen 6.5
- */
-#define UA_MAC_TYPE_UWB 0x20
-
-/**
  * @brief The handle of payload information.
  * @since_tizen 6.5
  */
diff --git a/include/user-awareness-type.h b/include/user-awareness-type.h
index 47e4c29..bea6b9f 100755
--- a/include/user-awareness-type.h
+++ b/include/user-awareness-type.h
@@ -36,63 +36,60 @@ extern "C" {
 #endif
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
+ * @ingroup CAPI_NETWORK_FRAMEWORK
+ * @addtogroup CAPI_NETWORK_UA_MODULE
+ * @{
+ */
+
+/**
  * @brief Max. MAC address length.
  * @since_tizen 6.5
  */
 #define UA_MAC_ADDRESS_STRING_LEN 18
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Max. IPv4 address length.
  * @since_tizen 6.5
  */
 #define UA_IPV4_ADDRESS_STRING_LEN 16
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Max. IP address length (e.g. IPv6).
  * @since_tizen 6.5
  */
 #define UA_IP_ADDRESS_MAX_STRING_LEN 50
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Max. device ID length (e.g. UUID).
  * @since_tizen 6.5
  */
 #define UA_MOBILE_ID_STRING_LEN 50
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Max. user name length.
  * @since_tizen 6.5
  */
 #define UA_USER_NAME_MAX_STRING_LEN 50
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Max. user account length.
  * @since_tizen 6.5
  */
 #define UA_USER_ACCOUNT_MAX_STRING_LEN 70
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Device scan time multiplier.
  * @since_tizen 6.5
  */
 #define UA_SCAN_TIME_MULTIPLIER 10
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Max. service name length.
  * @since_tizen 6.5
  */
 #define UA_MAX_SERVICE_LEN 50
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Window step multiplier.
  * @details Detection window step is 5 seconds.
  * @since_tizen 6.5
@@ -100,7 +97,6 @@ extern "C" {
 #define UA_DETECTION_WINDOW_STEP 5
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Detection cycle multiplier.
  * @details Detection cycle step is 60 seconds.
  * @since_tizen 6.5
@@ -108,7 +104,37 @@ extern "C" {
 #define UA_DETECTION_CYCLE_STEP	60
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
+ * @brief Default location callback period (in msec).
+ * @since_tizen 6.5
+ */
+#define UA_LOCATION_PERIOD_DEFAULT 1000
+
+/**
+ * @brief Wifi location sensor.
+ * @since_tizen 6.5
+ */
+#define UA_SENSOR_WIFI_LOCATION 0x00000040
+
+/**
+ * @brief Wifi location mac type.
+ * @since_tizen 6.5
+ */
+#define UA_MAC_TYPE_WIFI_LOCATION 0x10
+
+/**
+ * @brief UWB sensor.
+ * @since_tizen 6.5
+ */
+#define UA_SENSOR_UWB 0x00000080
+
+/**
+ * @brief UWB mac type.
+ * @since_tizen 6.5
+ */
+#define UA_MAC_TYPE_UWB 0x20
+
+
+/**
  * @brief Enumeration for UA framework error codes.
  * @since_tizen 6.5
  */
@@ -137,7 +163,6 @@ typedef enum {
 } ua_error_e;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Enumeration for UA framework supported sensors.
  * @since_tizen 6.5
  */
@@ -153,7 +178,6 @@ typedef enum {
 } ua_sensor_type_e;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Enumeration for UA framework user detection modes.
  * @since_tizen 6.5
  */
@@ -164,7 +188,6 @@ typedef enum {
 } ua_detection_mode_e;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Enumeration for User device Operating Systems.
  * @since_tizen 6.5
  */
@@ -176,7 +199,6 @@ typedef enum {
 } ua_os_type_e;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Enumeration for User device MAC address types.
  * @since_tizen 6.5
  */
@@ -190,7 +212,6 @@ typedef enum {
 } ua_mac_type_e;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Enumeration for active scan type.
  * @since_tizen 6.5
  */
@@ -200,7 +221,6 @@ typedef enum {
 } ua_active_scan_type_e;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Enumeration for sensor status report.
  * @since_tizen 6.5
  */
@@ -210,42 +230,42 @@ typedef enum {
 } ua_sensor_report_e;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief The handle of sensor information.
  * @since_tizen 6.5
  */
 typedef void *ua_sensor_h;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief The handle of user presence/absence monitor.
  * @since_tizen 6.5
  */
 typedef void *ua_monitor_h;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief The handle of user information.
  * @since_tizen 6.5
  */
 typedef void *ua_user_h;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief The handle of service information.
  * @since_tizen 6.5
  */
 typedef void *ua_service_h;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief The handle of device information.
  * @since_tizen 6.5
  */
 typedef void *ua_device_h;
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
+ * @brief The handle of location information.
+ * @since_tizen 6.5
+ */
+typedef void *ua_location_h;
+
+/**
  * @brief Callback to be invoked if a sensor status changed (presence <-> absence)
  *        immediately during detection operation.
  * @since_tizen 6.5
@@ -270,7 +290,6 @@ typedef void (*ua_sensor_status_changed_cb)(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Callback to get all sensors for a handle.
  * @since_tizen 6.5
  *
@@ -287,7 +306,6 @@ typedef bool (*ua_monitor_sensor_cb)(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Callback to be invoked on completion scan for each device one by one.
  * @since_tizen 6.5
  *
@@ -311,8 +329,10 @@ typedef void (*ua_scan_completed_cb)(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Callback to be invoked on detection of user presence.
+ * @details Following error codes can be delivered:
+ * #UA_ERROR_NONE Successful.
+ * #UA_ERROR_OPERATION_FAILED Operation failed
  * @since_tizen 6.5
  *
  * @remarks The @a monitor handle should not be released.
@@ -326,10 +346,6 @@ typedef void (*ua_scan_completed_cb)(
  *
  * @param[in] result The result error code of the requested operation.
  * result is #UA_ERROR_NONE on success, otherwise appropriate error value.
- * @details Following error codes can be delivered:
- * #UA_ERROR_NONE Successful.
- * #UA_ERROR_OPERATION_FAILED Operation failed
- *
  * @param[in] monitor The monitor handle
  * @param[in] sensor_type Sensor type, In case monitor has more than one sensor and detection
  *  mode is not #UA_DETECT_MODE_ANY_SENSOR, sensor will be set to last sensor which
@@ -351,8 +367,10 @@ typedef void (*ua_presence_detected_cb)(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Callback to be invoked on detection of user absence.
+ * @details Following error codes can be delivered:
+ * #UA_ERROR_NONE Successful.
+ * #UA_ERROR_OPERATION_FAILED Operation failed
  * @since_tizen 6.5
  *
  * @remarks The @a monitor handle should not be released.
@@ -364,10 +382,6 @@ typedef void (*ua_presence_detected_cb)(
  *
  * @param[in] result The result error code of the requested operation.
  * result is #UA_ERROR_NONE on success, otherwise appropriate error value.
- * @details Following error codes can be delivered:
- * #UA_ERROR_NONE Successful.
- * #UA_ERROR_OPERATION_FAILED Operation failed
- *
  * @param[in] monitor The monitor handle with which absence detection start was invoked.
  * @param[in] service The service handle with which absence detection start was invoked.
  * @param[in] sensor_type Sensor type by which absence was detected.
@@ -385,7 +399,6 @@ typedef void (*ua_absence_detected_cb)(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Callback to get all registered devices one by one.
  * @since_tizen 6.5
  *
@@ -404,7 +417,6 @@ typedef bool (*ua_registered_device_cb)(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Callback to get all service handles.
  * @since_tizen 6.5
  *
@@ -423,7 +435,6 @@ typedef bool (*ua_service_cb)(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Callback to get the user handle added to the service.
  * @since_tizen 6.5
  *
@@ -446,8 +457,10 @@ typedef bool (*ua_service_user_cb)(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Callback to be invoked when adding a new device to UA is finished.
+ * @details Following error codes can be delivered:
+ * #UA_ERROR_NONE Successful.
+ * #UA_ERROR_OPERATION_FAILED Operation failed
  * @since_tizen 6.5
  *
  * @remarks The @a device handle should not be released.
@@ -455,10 +468,6 @@ typedef bool (*ua_service_user_cb)(
  *
  * @param[in] result The result error code of the requested operation.
  * result is #UA_ERROR_NONE on success, otherwise appropriate error value.
- * @details Following error codes can be delivered:
- * #UA_ERROR_NONE Successful.
- * #UA_ERROR_OPERATION_FAILED Operation failed
- *
  * @param[in] device The added device's handle
  * @param[in] user_data The user data passed in ua_user_add_device()
  *
@@ -470,6 +479,47 @@ typedef void (*ua_user_device_added_cb)(
 		void *user_data);
 
 /**
+ * @brief Callback to be invoked on detection of user and device location.
+ * It is invoked once for each user/device in location callback.
+ * Callback period can be set by ua_monitor_set_location_period().
+ * @details Following error codes can be delivered:
+ * #UA_ERROR_NONE Successful.
+ * #UA_ERROR_OPERATION_FAILED Operation failed
+ * @since_tizen 6.5
+ *
+ * @remarks The @a monitor handle should not be released and can be used only in the callback.
+ * @remarks The @a service handle should not be released and can be used only in the callback.
+ * @remarks The @a sensor handle should not be released and can be used only in the callback.
+ * @remarks The @a device handle should not be released and can be used only in the callback.
+ * @remarks The @a user handle should not be released and can be used only in the callback.
+ * @remarks The @a location handle should not be released and can be used only in the callback.
+ *
+ * @param[in] result The result error code of the requested operation.
+ * result is #UA_ERROR_NONE on success, otherwise appropriate error value.
+ * @param[in] monitor The monitor handle
+ * @param[in] service The service handle with which location detection start was invoked.
+ * @param[in] sensor_type Sensor type
+ * @param[in] sensor The handle of the sensor which reported user/device location.
+ * @param[in] device The device handle on which sensor is detected.
+ * @param[in] user The user handle on which sensor is detected.
+ * @param[in] location The location handle.
+ * @param[in] user_data The user data passed in ua_monitor_start_location_detection()
+ *
+ * @see ua_monitor_set_location_period()
+ * @see ua_monitor_start_location_detection()
+ */
+typedef void (*ua_location_detected_cb)(
+		ua_error_e result,
+		ua_monitor_h monitor,
+		ua_service_h service,
+		ua_sensor_type_e sensor_type,
+		ua_sensor_h sensor,
+		ua_device_h device,
+		ua_user_h user,
+		ua_location_h location,
+		void *user_data);
+
+/**
  * @}
  */
 
diff --git a/include/user-awareness.h b/include/user-awareness.h
index b552139..feeeebe 100755
--- a/include/user-awareness.h
+++ b/include/user-awareness.h
@@ -34,42 +34,39 @@ extern "C" {
 
 /**
  * @ingroup CAPI_NETWORK_FRAMEWORK
- * @addtogroup CAPI_NETWORK_UA_MODULE User Awareness
+ * @addtogroup CAPI_NETWORK_UA_MODULE
  * @{
  */
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Initializes the user awareness framework.
  * @since_tizen 6.5
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_ALREADY_DONE Already initialized
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_deinitialize()
  */
 int ua_initialize(void);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief De-initializes the user awareness framework.
  * @since_tizen 6.5
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
  * @retval #UA_ERROR_ALREADY_DONE Already initialized
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_initialize()
  */
 int ua_deinitialize(void);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Retrieves handles of all added services.
  * @since_tizen 6.5
  *
@@ -78,9 +75,9 @@ int ua_deinitialize(void);
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_cb()
  */
@@ -89,7 +86,6 @@ int ua_foreach_service(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets default service handle.
  * @since_tizen 6.5
  *
@@ -99,10 +95,10 @@ int ua_foreach_service(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_get_name()
  * @see ua_service_create()
@@ -111,7 +107,6 @@ int ua_get_default_service(
 		ua_service_h *service);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets service handle by service name for added service.
  * @since_tizen 6.5
  *
@@ -122,10 +117,10 @@ int ua_get_default_service(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter or if service with such name does not exist.
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_create()
  */
@@ -134,7 +129,6 @@ int ua_get_service_by_name(
 			ua_service_h *service);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Creates the ua monitor's handle.
  * @since_tizen 6.5
  *
@@ -144,11 +138,10 @@ int ua_get_service_by_name(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_monitor_destroy()
  */
@@ -156,7 +149,6 @@ int ua_monitor_create(
 		ua_monitor_h *monitor);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Destroys the ua monitor's handle.
  * @since_tizen 6.5
  *
@@ -164,10 +156,9 @@ int ua_monitor_create(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_monitor_create()
  */
@@ -175,9 +166,8 @@ int ua_monitor_destroy(
 		ua_monitor_h monitor);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Adds sensors to UA monitor for which monitoring is to be done.
- * Availability of sensors to be added can be checked using ua_monitor_is_sensor_available()
+ * Availability of sensors to be added can be checked using ua_monitor_is_sensor_available().
  * @since_tizen 6.5
  * @remarks If you want to add the BLE sensor,
  * you should add privilege %http://tizen.org/privilege/bluetooth.
@@ -189,6 +179,7 @@ int ua_monitor_destroy(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter or sensor not available to add
  * @retval #UA_ERROR_NOT_PERMITTED Operation not permitted
@@ -196,7 +187,6 @@ int ua_monitor_destroy(
  * @retval #UA_ERROR_NOT_READY Resource not ready
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_monitor_remove_sensor()
  * @see ua_monitor_foreach_sensor()
@@ -206,7 +196,6 @@ int ua_monitor_add_sensor(
 		ua_sensor_type_e sensor);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Removes sensors from UA monitor.
  * @since_tizen 6.5
  * @remarks If you want to remove the BLE sensor,
@@ -219,6 +208,7 @@ int ua_monitor_add_sensor(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter or sensor not available to remove
  * @retval #UA_ERROR_NOT_PERMITTED Operation not permitted
@@ -226,7 +216,6 @@ int ua_monitor_add_sensor(
  * @retval #UA_ERROR_NOT_READY Resource not ready
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_monitor_add_sensor()
  * @see ua_monitor_foreach_sensor()
@@ -236,7 +225,6 @@ int ua_monitor_remove_sensor(
 		ua_sensor_type_e sensor);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Retrieves all sensors present in UA monitor.
  * @since_tizen 6.5
  *
@@ -246,10 +234,10 @@ int ua_monitor_remove_sensor(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_monitor_add_sensor()
  * @see ua_monitor_remove_sensor()
@@ -260,7 +248,6 @@ int ua_monitor_foreach_sensor(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Checks if sensor is available or not.
  * @since_tizen 6.5
  *
@@ -269,10 +256,10 @@ int ua_monitor_foreach_sensor(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  */
 int ua_monitor_is_sensor_available(
@@ -280,7 +267,6 @@ int ua_monitor_is_sensor_available(
 		bool *available);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Sets sensor status changed callback. Callback to be invoked
  * when sensor status changes from 'PRESENCE' to 'ABSENCE' or vice-versa.
  * @since_tizen 6.5
@@ -295,9 +281,9 @@ int ua_monitor_is_sensor_available(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  */
 int ua_monitor_set_sensor_status_changed_cb(
@@ -306,7 +292,6 @@ int ua_monitor_set_sensor_status_changed_cb(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Unsets sensor status changed callback.
  * @since_tizen 6.5
  *
@@ -314,9 +299,9 @@ int ua_monitor_set_sensor_status_changed_cb(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_monitor_set_sensor_status_changed_cb()
  */
@@ -324,7 +309,6 @@ int ua_monitor_unset_sensor_status_changed_cb(
 		ua_monitor_h monitor);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Starts scan of registered devices.
  * @since_tizen 6.5
  * @privlevel public
@@ -345,13 +329,13 @@ int ua_monitor_unset_sensor_status_changed_cb(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOW_IN_PROGRESS Operation now in progress
  * @retval #UA_ERROR_NO_DATA No sensor available
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see UA_SCAN_TIME_MULTIPLIER
  * @see ua_scan_completed_cb()
@@ -364,7 +348,6 @@ int ua_monitor_start_scan(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Stops ua_monitor_start_scan().
  * @since_tizen 6.5
  * @privlevel public
@@ -378,19 +361,18 @@ int ua_monitor_start_scan(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_IN_PROGRESS Operation not in progress
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_monitor_start_scan()
  */
 int ua_monitor_stop_scan(ua_monitor_h monitor);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Starts user presence detection.
  * @since_tizen 6.5
  * @privlevel public
@@ -415,13 +397,13 @@ int ua_monitor_stop_scan(ua_monitor_h monitor);
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOW_IN_PROGRESS Operation now in progress
  * @retval #UA_ERROR_NO_DATA No sensor available
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_presence_detected_cb()
  * @see ua_monitor_stop_presence_detection()
@@ -434,7 +416,6 @@ int ua_monitor_start_presence_detection(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Stops user presence detection.
  * @since_tizen 6.5
  * @privlevel public
@@ -448,12 +429,12 @@ int ua_monitor_start_presence_detection(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_IN_PROGRESS Operation not in progress
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_monitor_start_presence_detection()
  */
@@ -461,7 +442,6 @@ int ua_monitor_stop_presence_detection(
 		ua_monitor_h monitor);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Starts user absence detection.
  * @since_tizen 6.5
  * @privlevel public
@@ -486,13 +466,13 @@ int ua_monitor_stop_presence_detection(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOW_IN_PROGRESS Operation now in progress
  * @retval #UA_ERROR_NO_DATA No sensor available
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_absence_detected_cb()
  * @see ua_monitor_stop_absence_detection()
@@ -505,7 +485,6 @@ int ua_monitor_start_absence_detection(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Stops user absence detection.
  * @since_tizen 6.5
  * @privlevel public
@@ -519,12 +498,12 @@ int ua_monitor_start_absence_detection(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_IN_PROGRESS Operation not in progress
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_monitor_start_absence_detection()
  */
@@ -532,7 +511,84 @@ int ua_monitor_stop_absence_detection(
 		ua_monitor_h monitor);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
+ * @brief Sets the location callback period in milli-seconds.
+ * If location period is not set, it will be automatically
+ * set to #UA_LOCATION_PERIOD_DEFAULT.
+ * @since_tizen 6.5
+ *
+ * @param[in] monitor The monitor handle
+ * @param[in] location_period location period (0 to UINT_MAX)
+ *
+ * @return 0 on success, otherwise a negative error value
+ * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
+ */
+int ua_monitor_set_location_period(
+	ua_monitor_h monitor, unsigned int location_period);
+
+/**
+ * @brief Starts user location detection.
+ * @since_tizen 6.5
+ * @privlevel public
+ * @privilege %http://tizen.org/privilege/location
+ * @remarks If you want to start BLE location detection,
+ * you should add privilege %http://tizen.org/privilege/bluetooth.
+ * If you want to start Wi-Fi location detection,
+ * you should add privilege %http://tizen.org/privilege/network.get.
+ *
+ * @param[in] monitor The monitor handle
+ * @param[in] service The service handle. If service is NULL then monitor will start for default service.
+ * @param[in] callback Callback to be invoked after device location detection.
+ * @param[in] user_data The user data to be passed when callback is called.
+ *
+ * @return 0 on success, otherwise a negative error value
+ * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
+ * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #UA_ERROR_NOW_IN_PROGRESS Operation now in progress
+ * @retval #UA_ERROR_NO_DATA No sensor available
+ * @retval #UA_ERROR_OPERATION_FAILED Operation failed
+ * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
+ *
+ * @see ua_location_detected_cb()
+ * @see ua_monitor_set_location_period()
+ * @see ua_monitor_stop_location_detection()
+ */
+int ua_monitor_start_location_detection(
+		ua_monitor_h monitor,
+		ua_service_h service,
+		ua_location_detected_cb callback,
+		void *user_data);
+
+/**
+ * @brief Stops user location detection.
+ * @since_tizen 6.5
+ * @privlevel public
+ * @privilege %http://tizen.org/privilege/location
+ * @remarks If you want to stop BLE location detection,
+ * you should add privilege %http://tizen.org/privilege/bluetooth.
+ * If you want to stop Wi-Fi location detection,
+ * you should add privilege %http://tizen.org/privilege/network.get.
+ *
+ * @param[in] monitor UA monitor's handle
+ *
+ * @return 0 on success, otherwise a negative error value
+ * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
+ * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #UA_ERROR_NOT_IN_PROGRESS Operation not in progress
+ * @retval #UA_ERROR_OPERATION_FAILED Operation failed
+ * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
+ *
+ * @see ua_monitor_start_location_detection()
+ */
+int ua_monitor_stop_location_detection(
+			ua_monitor_h monitor);
+
+/**
  * @brief Creates the user handle.
  * @since_tizen 6.5
  *
@@ -544,11 +600,10 @@ int ua_monitor_stop_absence_detection(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_user_destroy()
  */
@@ -556,7 +611,6 @@ int ua_user_create(const char *account,
 		ua_user_h *user);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Destroys the user handle.
  * @since_tizen 6.5
  *
@@ -566,10 +620,9 @@ int ua_user_create(const char *account,
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_user_create()
  */
@@ -577,7 +630,6 @@ int ua_user_destroy(
 		ua_user_h user);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Adds the user. Added user is stored in the database
  * and is also available after the application restarts.
  * @since_tizen 6.5
@@ -586,11 +638,10 @@ int ua_user_destroy(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_ALREADY_REGISTERED Already Registered
  *
  * @see ua_user_remove()
@@ -598,7 +649,6 @@ int ua_user_destroy(
 int ua_user_add(ua_user_h user);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Removes the user.
  * @since_tizen 6.5
  *
@@ -606,18 +656,16 @@ int ua_user_add(ua_user_h user);
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_user_add()
  */
 int ua_user_remove(ua_user_h user);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets account info for user handle.
  * @since_tizen 6.5
  *
@@ -627,17 +675,16 @@ int ua_user_remove(ua_user_h user);
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_user_create()
  */
 int ua_user_get_account(ua_user_h user, char **account);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Adds device for a user. This information is stored in database
  * and is also available after the application restarts.
  * @since_tizen 6.5
@@ -653,10 +700,10 @@ int ua_user_get_account(ua_user_h user, char **account);
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_user_remove_device()
  * @see ua_user_device_added_cb()
@@ -668,7 +715,6 @@ int ua_user_add_device(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Removes the device handle for a user handle.
  * @since_tizen 6.5
  * @remarks If you want to remove the BLE device,
@@ -681,12 +727,12 @@ int ua_user_add_device(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_RESOURCE_BUSY Remove done. but another service uses this device.
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_user_add_device()
  */
@@ -695,7 +741,6 @@ int ua_user_remove_device(
 		ua_device_h device);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Retrieves the device handle of all the registered devices for a specific user.
  * @since_tizen 6.5
  *
@@ -705,10 +750,10 @@ int ua_user_remove_device(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_registered_device_cb()
  */
@@ -718,7 +763,6 @@ int ua_user_foreach_devices(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Creates the service handle.
  * @since_tizen 6.5
  *
@@ -729,11 +773,10 @@ int ua_user_foreach_devices(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_destroy()
  */
@@ -742,7 +785,6 @@ int ua_service_create(
 	ua_service_h *service);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Destroys the service handle.
  * @since_tizen 6.5
  *
@@ -752,10 +794,9 @@ int ua_service_create(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_create()
  */
@@ -763,7 +804,6 @@ int ua_service_destroy(
 		ua_service_h service);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Adds the service. Added service is stored in database
  * and is also available after the application restarts.
  * @since_tizen 6.5
@@ -772,11 +812,10 @@ int ua_service_destroy(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_remove()
  */
@@ -784,7 +823,6 @@ int ua_service_add(
 		ua_service_h service);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Updates the properties for the added service.
  * To update a property of a service its respective setter functions
  * should be called and then followed by the call of ua_service_update().
@@ -794,11 +832,10 @@ int ua_service_add(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_create()
  * @see ua_service_remove()
@@ -807,7 +844,6 @@ int ua_service_update(
 		ua_service_h service);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Removes the service.
  * @since_tizen 6.5
  *
@@ -815,11 +851,10 @@ int ua_service_update(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_add()
  */
@@ -827,7 +862,6 @@ int ua_service_remove(
 		ua_service_h service);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets name info for service handle.
  * @since_tizen 6.5
  *
@@ -838,9 +872,9 @@ int ua_service_remove(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_create()
  */
@@ -849,7 +883,6 @@ int ua_service_get_name(
 		char **name);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Sets detection threshold for service handle.
  * If the service has already been added, this call should be followed by
  * the call of ua_service_update() to reflect the modifications.
@@ -861,9 +894,9 @@ int ua_service_get_name(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  */
 int ua_service_set_detection_threshold(
@@ -872,7 +905,6 @@ int ua_service_set_detection_threshold(
 		unsigned int absence_threshold);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets detection threshold for service handle.
  * @since_tizen 6.5
  *
@@ -882,10 +914,9 @@ int ua_service_set_detection_threshold(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_set_detection_threshold()
  */
@@ -895,7 +926,6 @@ int ua_service_get_detection_threshold(
 		unsigned int *absence_threshold);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Sets name info for service handle.
  * @since_tizen 6.5
  *
@@ -910,16 +940,15 @@ int ua_service_get_detection_threshold(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  */
 int ua_service_get_user_by_account(ua_service_h service,
 		const char* account, ua_user_h *user);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Adds a user for a specific service.
  * @since_tizen 6.5
  *
@@ -928,10 +957,9 @@ int ua_service_get_user_by_account(ua_service_h service,
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_remove_user()
  */
@@ -940,7 +968,6 @@ int ua_service_add_user(
 		ua_user_h user);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Removes the user for the specific service handle.
  * @since_tizen 6.5
  *
@@ -949,11 +976,10 @@ int ua_service_add_user(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_add_user()
  */
@@ -962,7 +988,6 @@ int ua_service_remove_user(
 		ua_user_h user);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Triggers callback for every user of a specific service.
  * @since_tizen 6.5
  *
@@ -972,9 +997,9 @@ int ua_service_remove_user(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_service_user_cb()
  */
@@ -984,7 +1009,6 @@ int ua_service_foreach_users(
 		void *user_data);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Creates the device handle.
  * @since_tizen 6.5
  *
@@ -998,11 +1022,10 @@ int ua_service_foreach_users(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_device_destroy()
  */
@@ -1012,7 +1035,6 @@ int ua_device_create(ua_mac_type_e mac_type,
 			ua_device_h *device);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Destroys the device handle.
  * @since_tizen 6.5
  *
@@ -1022,10 +1044,9 @@ int ua_device_create(ua_mac_type_e mac_type,
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_device_create()
  */
@@ -1033,7 +1054,6 @@ int ua_device_destroy(
 		ua_device_h device);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets device type info from the device.
  * @since_tizen 6.5
  *
@@ -1050,7 +1070,6 @@ int ua_device_get_mac_type(
 		ua_mac_type_e *mac_type);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Sets device's operating system info.
  * If the device has already been added, this call should be followed by
  * the call of ua_device_update() to reflect the modifications.
@@ -1061,10 +1080,9 @@ int ua_device_get_mac_type(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_device_get_os_info()
  */
@@ -1073,7 +1091,6 @@ int ua_device_set_os_info(
 		ua_os_type_e os);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets device's operating system info.
  * @since_tizen 6.5
  *
@@ -1091,7 +1108,6 @@ int ua_device_get_os_info(
 		ua_os_type_e *os_info);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets device's MAC address.
  * @since_tizen 6.5
  *
@@ -1110,7 +1126,6 @@ int ua_device_get_mac_address(
 		char **mac_address);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets device ID of device, which was set while creating the device handle.
  * @since_tizen 6.5
  *
@@ -1128,7 +1143,6 @@ int ua_device_get_device_id(
 		char **device_id);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Sets device's Wi-Fi BSSID.
  * If the device has already been added, this call should be followed by
  * the call of ua_device_update() to reflect the modifications.
@@ -1139,10 +1153,9 @@ int ua_device_get_device_id(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_device_get_wifi_bssid()
  */
@@ -1151,7 +1164,6 @@ int ua_device_set_wifi_bssid(
 		const char *bssid);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets device's Wi-Fi BSSID.
  * @since_tizen 6.5
  *
@@ -1169,7 +1181,6 @@ int ua_device_get_wifi_bssid(
 		ua_device_h device,
 		char **bssid);
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Sets device's Wi-Fi IPv4 address.
  * If the device has already been added, this call should be followed by
  * the call of ua_device_update() to reflect the modifications.
@@ -1180,10 +1191,9 @@ int ua_device_get_wifi_bssid(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_device_get_wifi_ipv4_address()
  */
@@ -1192,7 +1202,6 @@ int ua_device_set_wifi_ipv4_address(
 		const char *ipv4_address);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets device's Wi-Fi IPv4 address.
  * @since_tizen 6.5
  *
@@ -1212,7 +1221,6 @@ int ua_device_get_wifi_ipv4_address(
 		char **ipv4_address);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets last presence time for device handle.
  * @since_tizen 6.5
  *
@@ -1229,7 +1237,6 @@ int ua_device_get_last_presence(
 		unsigned long long *last_seen);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets whether pairing is required for the user device.
  * @since_tizen 6.5
  *
@@ -1238,10 +1245,10 @@ int ua_device_get_last_presence(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_device_create()
  */
@@ -1250,7 +1257,6 @@ int ua_device_get_pairing_required(
 		bool *pairing_required);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Updates the properties for the added device.
  * To update a property of a device its respective setter functions
  * should be called and then followed by the call of ua_device_update().
@@ -1264,11 +1270,11 @@ int ua_device_get_pairing_required(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OPERATION_FAILED Operation failed
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  * @see ua_device_set_os_info()
  * @see ua_device_set_wifi_ipv4_address()
@@ -1277,7 +1283,6 @@ int ua_device_update(
 		ua_device_h device);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets device handle by MAC address.
  * @since_tizen 6.5
  *
@@ -1291,10 +1296,10 @@ int ua_device_update(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  */
 int ua_device_get_by_mac_address(
@@ -1302,7 +1307,6 @@ int ua_device_get_by_mac_address(
 		ua_device_h *device);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets device handle by device ID.
  * @since_tizen 6.5
  *
@@ -1317,10 +1321,10 @@ int ua_device_get_by_mac_address(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  */
 int ua_device_get_by_device_id(
@@ -1329,7 +1333,6 @@ int ua_device_get_by_device_id(
 		ua_device_h *device);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets sensor's status report.
  * @since_tizen 6.5
  *
@@ -1338,9 +1341,9 @@ int ua_device_get_by_device_id(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  */
 int ua_sensor_get_status(
@@ -1348,7 +1351,6 @@ int ua_sensor_get_status(
 		ua_sensor_report_e *report);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets sensor's timestamp.
  * @since_tizen 6.5
  *
@@ -1357,9 +1359,9 @@ int ua_sensor_get_status(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  */
 int ua_sensor_get_timestamp(
@@ -1367,7 +1369,6 @@ int ua_sensor_get_timestamp(
 		unsigned long long *timestamp);
 
 /**
- * @ingroup CAPI_NETWORK_UA_MODULE
  * @brief Gets sensor's type.
  * @since_tizen 6.5
  *
@@ -1376,9 +1377,9 @@ int ua_sensor_get_timestamp(
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
- * @retval #UA_ERROR_NOT_SUPPORTED Not Supported
  *
  */
 int ua_sensor_get_type(
@@ -1386,6 +1387,43 @@ int ua_sensor_get_type(
 		ua_sensor_type_e *type);
 
 /**
+ * @brief Gets the distance for the location handle.
+ * @since_tizen 6.5
+ * @privlevel public
+ * @privilege %http://tizen.org/privilege/location
+ *
+ * @param[in] location The location handle for location information.
+ * @param[out] distance distance of the detected device and user.
+ *
+ * @return 0 on success, otherwise a negative error value
+ * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
+ */
+int ua_location_get_distance(ua_location_h location, int *distance);
+
+/**
+ * @brief Gets the position for the location handle.
+ * @since_tizen 6.5
+ * @privlevel public
+ * @privilege %http://tizen.org/privilege/location
+ *
+ * @param[in] location The location handle for location information.
+ * @param[out] x x-coordinate of the location.
+ * @param[out] y y-coordinate of the location.
+ * @param[out] z z-coordinate of the location.
+ *
+ * @return 0 on success, otherwise a negative error value
+ * @retval #UA_ERROR_NONE Successful
+ * @retval #UA_ERROR_PERMISSION_DENIED Permission Denied
+ * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
+ */
+int ua_location_get_position(ua_location_h location,
+					int *x, int *y, int *z);
+
+/**
  * @}
  */
 
diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec
index c012737..eb420de 100644
--- a/packaging/capi-network-ua.spec
+++ b/packaging/capi-network-ua.spec
@@ -1,6 +1,6 @@
 Name: capi-network-ua
 Summary: User Awareness Framework CAPI
-Version: 0.14.5
+Version: 0.14.6
 Release: 1
 License: Apache-2.0
 Source0: %{name}-%{version}.tar.gz
diff --git a/src/user-awareness-monitors.c b/src/user-awareness-monitors.c
index 9a9dc8a..a00cde1 100755
--- a/src/user-awareness-monitors.c
+++ b/src/user-awareness-monitors.c
@@ -1768,6 +1768,7 @@ int ua_monitor_start_location_detection(
 	ua_detection_type_e detect = UA_LOCATION_DETECTION;
 
 	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_COMMON);
+	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_LOCATION);
 	UA_CHECK_INIT_STATUS();
 	UA_VALIDATE_INPUT_PARAMETER(monitor_handle);
 	UA_VALIDATE_HANDLE(monitor_handle, ua_monitor_list);
@@ -1944,6 +1945,7 @@ int ua_monitor_stop_location_detection(ua_monitor_h handle)
 	unsigned int available_sensors = 0;
 
 	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_COMMON);
+	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_LOCATION);
 	UA_CHECK_INIT_STATUS();
 	UA_VALIDATE_INPUT_PARAMETER(handle);
 	UA_VALIDATE_HANDLE(handle, ua_monitor_list);
@@ -1982,6 +1984,7 @@ int ua_location_get_distance(ua_location_h location_handle, int *distance)
 	ua_location_info_s *location = (ua_location_info_s*)location_handle;
 
 	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_COMMON);
+	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_LOCATION);
 	UA_CHECK_INIT_STATUS();
 	UA_VALIDATE_INPUT_PARAMETER(distance);
 	UA_VALIDATE_INPUT_PARAMETER(location_handle);
@@ -2001,6 +2004,7 @@ int ua_location_get_position(ua_location_h location_handle,
 	ua_location_info_s *location = (ua_location_info_s*)location_handle;
 
 	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_COMMON);
+	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_LOCATION);
 	UA_CHECK_INIT_STATUS();
 	UA_VALIDATE_INPUT_PARAMETER(x);
 	UA_VALIDATE_INPUT_PARAMETER(y);
@@ -2023,6 +2027,8 @@ int ua_monitor_set_location_period(
 	FUNC_ENTRY;
 	ua_monitor_s *monitor = (ua_monitor_s *)handle;
 
+	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_COMMON);
+	UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_LOCATION);
 	UA_CHECK_INIT_STATUS();
 	UA_VALIDATE_INPUT_PARAMETER(handle);
 	UA_VALIDATE_HANDLE(handle, ua_monitor_list);
diff --git a/src/user-awareness-util.c b/src/user-awareness-util.c
index 0c75de9..acb4dc2 100755
--- a/src/user-awareness-util.c
+++ b/src/user-awareness-util.c
@@ -28,6 +28,7 @@ static GSList *ua_location_list = NULL; /* ua_location_info_s */
 
 static ua_feature_table_t feature_table[] = {
 	{"tizen.org/feature/user_awareness", FALSE, FALSE}, /* UA_FEATURE_COMMON */
+	{"tizen.org/feature/user_awareness.location", FALSE, FALSE}, /* UA_FEATURE_LOCATION */
 };
 
 int _ua_check_supported_feature(ua_feature_t feature, bool *supported)