Add to request add/remove sensor

Change-Id: I6922408fbde9d85d9bf9794feea559565488eb9a
Signed-off-by: hyunuk.tak <hyunuk.tak@samsung.com>

diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec
index e0b5dadd8411cecbe65d384f0bd4c2114714dffe..c012737ddaa44575c1212d9a5326de05f00f8400 100644 (file)
--- 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.4
+Version: 0.14.5
 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 b5d58a3069df6e86ceb3a3a2222f86ddd4fa93bd..0d48832a299e442e70117f03a0ff8b0d27dedb31 100755 (executable)
--- a/src/user-awareness-monitors.c
+++ b/src/user-awareness-monitors.c
@@ -1292,6 +1292,7 @@ int ua_monitor_add_sensor(
 {
        FUNC_ENTRY;
        ua_monitor_s *monitor = (ua_monitor_s *)handle;
+       int ret;
        unsigned int bitmask;
        unsigned int available_sensors = 0;
 
@@ -1301,6 +1302,15 @@ int ua_monitor_add_sensor(
        UA_VALIDATE_HANDLE(handle, ua_monitor_list);
 
        bitmask = __ua_sensor_type_to_bitmask(sensor_type);
+       ret = _ua_get_error_code(_uam_request_add_sensor(bitmask));
+       if (UA_ERROR_NONE != ret) {
+               /* LCOV_EXCL_START */
+               UA_ERR("Failed with error: %s(0x%X)",
+                               _ua_get_error_string(ret), ret);
+               return ret;
+               /* LCOV_EXCL_STOP */
+       }
+
        retv_if(0 != (monitor->sensor_bitmask & bitmask), UA_ERROR_ALREADY_DONE);
 
        if (UA_ERROR_NONE != _ua_get_error_code(
@@ -1321,6 +1331,7 @@ int ua_monitor_remove_sensor(
 {
        FUNC_ENTRY;
        ua_monitor_s *monitor = (ua_monitor_s *)handle;
+       int ret;
        unsigned int bitmask;
 
        UA_CHECK_SUPPORTED_FEATURE(UA_FEATURE_COMMON);
@@ -1329,6 +1340,15 @@ int ua_monitor_remove_sensor(
        UA_VALIDATE_HANDLE(handle, ua_monitor_list);
 
        bitmask = __ua_sensor_type_to_bitmask(sensor_type);
+       ret = _ua_get_error_code(_uam_request_remove_sensor(bitmask));
+       if (UA_ERROR_NONE != ret) {
+               /* LCOV_EXCL_START */
+               UA_ERR("Failed with error: %s(0x%X)",
+                               _ua_get_error_string(ret), ret);
+               return ret;
+               /* LCOV_EXCL_STOP */
+       }
+
        retv_if(0 == (monitor->sensor_bitmask & bitmask), UA_ERROR_ALREADY_DONE);
 
        monitor->sensor_bitmask &= ~bitmask;

diff --git a/tests/unittest/mock/user-awareness-mock.c b/tests/unittest/mock/user-awareness-mock.c
index e50ef0dbe9cfce090b78e6a984c4936ead562036..1042a4283b86121694b4bfdf301b50993e6ea1d0 100755 (executable)
--- a/tests/unittest/mock/user-awareness-mock.c
+++ b/tests/unittest/mock/user-awareness-mock.c
@@ -365,3 +365,13 @@ API int _uam_request_get_device_by_deviceid(const char *device_id,
 
        return UAM_ERROR_NONE;
 }
+
+API int _uam_request_add_sensor(unsigned int bitmask)
+{
+       return UAM_ERROR_NONE;
+}
+
+API int _uam_request_remove_sensor(unsigned int bitmask)
+{
+       return UAM_ERROR_NONE;
+}