diff options
| author | Lokesh <l.kasana@samsung.com> | 2019-09-05 17:06:22 +0530 |
|---|---|---|
| committer | saerome.kim <saerome.kim@samsung.com> | 2019-09-16 21:04:54 +0900 |
| commit | 2971ab4d307ccec5fee5029c8830e9a2ec4f62cc (patch) | |
| tree | d14cde3571268734e36700e64223baec2064c27c | |
| parent | 2cf122c68b87a9711630fa9de18579b357f73acb (diff) | |
| download | user-awareness-2971ab4d307ccec5fee5029c8830e9a2ec4f62cc.tar.gz user-awareness-2971ab4d307ccec5fee5029c8830e9a2ec4f62cc.tar.bz2 user-awareness-2971ab4d307ccec5fee5029c8830e9a2ec4f62cc.zip | |
Changed 'env_absence_bm' to 'env_absence_bitmask'
user_handle is checked to be non-null in __ua_monitor_send_user_presence_cb()
Change-Id: Ic0382c0c8a03887026943f78aebd5c1e2cdc1d16
Signed-off-by: Lokesh <l.kasana@samsung.com>
| -rw-r--r-- | packaging/capi-network-ua.spec | 2 | ||||
| -rw-r--r-- | src/user-awareness-monitors.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec index 16c4586..3f8dc2c 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.8.5 +Version: 0.8.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 4ebe57b..69ebf9b 100644 --- a/src/user-awareness-monitors.c +++ b/src/user-awareness-monitors.c @@ -281,7 +281,7 @@ static void __ua_monitor_send_user_presence_cb(ua_monitor_s *monitor, * Check whether user_handle present or not and also check * whether presence has been started or not. */ - if (user_state->cb_sent + if (!user_handle || user_state->cb_sent || !monitor->presence_user_cb.callback || !monitor->presence_detection_started) { FUNC_EXIT; @@ -433,7 +433,7 @@ static void __ua_monitor_send_user_absence_cb(ua_monitor_s *monitor, ua_user_h user_handle, unsigned int user_sensor_bitmask) { FUNC_ENTRY; - unsigned int env_absence_bm = 0; + unsigned int env_absence_bitmask = 0; gboolean and_condition = 0; gboolean or_condition = 0; gboolean condition_result = 0; @@ -452,21 +452,21 @@ static void __ua_monitor_send_user_absence_cb(ua_monitor_s *monitor, * so we need to invert the user_sensor_bitmask to calculate absence. */ user_sensor_bitmask = ~user_sensor_bitmask; - env_absence_bm = monitor->absence_detected_bitmask + env_absence_bitmask = monitor->absence_detected_bitmask & (UA_SENSOR_MOTION | UA_SENSOR_LIGHT); UA_DBG("Bitmasks: user's sensor(absence) [%u], env_absence [%u], " \ "conditions: AND [%u] - OR [%u]", - user_sensor_bitmask, env_absence_bm, + user_sensor_bitmask, env_absence_bitmask, monitor->absence_bitmask_and, monitor->absence_bitmask_or); and_condition = monitor->absence_bitmask_and == (monitor->absence_bitmask_and - & (user_sensor_bitmask | env_absence_bm)); + & (user_sensor_bitmask | env_absence_bitmask)); or_condition = !monitor->absence_bitmask_or || (monitor->absence_bitmask_or - & (user_sensor_bitmask | env_absence_bm)); + & (user_sensor_bitmask | env_absence_bitmask)); UA_DBG("Conditions': AND[%s] [%s] OR[%s]", and_condition ? "true" : "false", |