diff options
author | Lokesh <l.kasana@samsung.com> | 2019-11-15 14:09:15 +0530 |
---|---|---|
committer | saerome.kim <saerome.kim@samsung.com> | 2019-11-15 19:15:58 +0900 |
commit | f7bb57d3225fc87684be270a6d2c30af6aceab54 (patch) | |
tree | 5d4846a3e6ae337793ee796bb0a4ce880236032a | |
parent | ac2243dcd7fa61303759af69bbd510585f269408 (diff) | |
download | user-awareness-f7bb57d3225fc87684be270a6d2c30af6aceab54.tar.gz user-awareness-f7bb57d3225fc87684be270a6d2c30af6aceab54.tar.bz2 user-awareness-f7bb57d3225fc87684be270a6d2c30af6aceab54.zip |
Pass the error in ua_user_foreach_added()submit/tizen_5.5/20191115.102057accepted/tizen/5.5/unified/20191118.084850
Change-Id: Ia9b8a7371dd49c235ebe878e443c2e497363d32c
Signed-off-by: Lokesh <l.kasana@samsung.com>
-rw-r--r-- | include/user-awareness.h | 2 | ||||
-rw-r--r-- | packaging/capi-network-ua.spec | 2 | ||||
-rw-r--r-- | src/user-awareness-event-handler.c | 9 | ||||
-rw-r--r-- | src/user-awareness-users.c | 5 |
4 files changed, 8 insertions, 10 deletions
diff --git a/include/user-awareness.h b/include/user-awareness.h index 55beb71..1148c04 100644 --- a/include/user-awareness.h +++ b/include/user-awareness.h @@ -1671,6 +1671,8 @@ int ua_user_remove_device( * @return 0 on success, otherwise a negative error value * @retval #UA_ERROR_NONE Successful * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter + * @retval #UA_ERROR_OUT_OF_MEMORY Out of memory + * @retval #UA_ERROR_OPERATION_FAILED Operation failed * * @exception * @pre diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec index f1f702f..4ae52df 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.13.0 +Version: 0.13.1 Release: 1 License: Apache-2.0 Source0: %{name}-%{version}.tar.gz diff --git a/src/user-awareness-event-handler.c b/src/user-awareness-event-handler.c index e591c84..d57f5ed 100644 --- a/src/user-awareness-event-handler.c +++ b/src/user-awareness-event-handler.c @@ -58,9 +58,8 @@ static void __ua_event_handler(int event, uam_event_data_s *event_param, sensor_info->sensor_bitmask = event_data->sensor_bitmask; sensor_info->timestamp = event_data->timestamp; - UA_INFO("sensor: [%u], timestamp [%llu], accuracy [%d], value [%f]", - sensor_info->sensor_bitmask, sensor_info->timestamp, - sensor_info->accuracy, sensor_info->values[0]); + UA_INFO("sensor_info: bitmask[%u], timestamp [%llu]", + sensor_info->sensor_bitmask, sensor_info->timestamp); _ua_monitor_handle_user_presence_detected( sensor_info, event_data->service, @@ -84,9 +83,7 @@ static void __ua_event_handler(int event, uam_event_data_s *event_param, sensor_info->sensor_bitmask = event_data->sensor_bitmask; - UA_INFO("sensor: [%u], timestamp [%llu], accuracy [%d], value [%f]", - sensor_info->sensor_bitmask, sensor_info->timestamp, - sensor_info->accuracy, sensor_info->values[0]); + UA_INFO("sensor_info: bitmask[%u]", sensor_info->sensor_bitmask); _ua_monitor_handle_user_absence_detected( sensor_info, event_data->service, diff --git a/src/user-awareness-users.c b/src/user-awareness-users.c index 3664e84..ff8d25f 100644 --- a/src/user-awareness-users.c +++ b/src/user-awareness-users.c @@ -885,13 +885,12 @@ int ua_user_foreach_added( void *user_data) { FUNC_ENTRY; - UA_VALIDATE_INPUT_PARAMETER(foreach_cb); - _ua_foreach_registered_users(foreach_cb, user_data); + int ret = _ua_foreach_registered_users(foreach_cb, user_data); FUNC_EXIT; - return UA_ERROR_NONE; + return ret; } int ua_user_add_device(ua_user_h user_handle, ua_device_h device_handle, |