diff options
author | Abhay agarwal <ay.agarwal@samsung.com> | 2019-11-11 11:42:20 +0530 |
---|---|---|
committer | saerome.kim <saerome.kim@samsung.com> | 2019-11-15 18:42:23 +0900 |
commit | e72ed39df5c0630c375de83bc9850891318c4646 (patch) | |
tree | 7888a06c4829bfe18d9f208b8c8da2f19f3865ac | |
parent | 0ee6e969307989c5fe0c3c043c793f60330fb089 (diff) | |
download | user-awareness-e72ed39df5c0630c375de83bc9850891318c4646.tar.gz user-awareness-e72ed39df5c0630c375de83bc9850891318c4646.tar.bz2 user-awareness-e72ed39df5c0630c375de83bc9850891318c4646.zip |
Start detection only on sensor available in monitor
Change-Id: Ia6f9f081c0d15d740e57115ff83bf42edee8fe10
Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>
-rw-r--r-- | packaging/capi-network-ua.spec | 2 | ||||
-rw-r--r-- | packaging/capi-network-ua.spec.orig | 110 | ||||
-rw-r--r-- | src/user-awareness-monitors.c | 4 |
3 files changed, 113 insertions, 3 deletions
diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec index 70f8136..f94588b 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.12.16 +Version: 0.12.17 Release: 1 License: Apache-2.0 Source0: %{name}-%{version}.tar.gz diff --git a/packaging/capi-network-ua.spec.orig b/packaging/capi-network-ua.spec.orig new file mode 100644 index 0000000..0cc7e26 --- /dev/null +++ b/packaging/capi-network-ua.spec.orig @@ -0,0 +1,110 @@ +Name: capi-network-ua +Summary: User Awareness Framework CAPI +<<<<<<< HEAD +Version: 0.12.16 +======= +Version: 0.12.15 +>>>>>>> Start detection only on sensor available in monitor +Release: 1 +License: Apache-2.0 +Source0: %{name}-%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(ua-api) + +%if 0%{?ptest:1} +BuildRequires: pkgconfig(deviced) +BuildRequires: pkgconfig(power-defs) +%endif + +%define _confdir /opt/data + +%description +Activity API Library + +%package devel +Summary: User Awareness Framework CAPI (devel) +Requires: %{name} = %{version} + +%description devel +User Awareness Framework CAPI + +%package test +Summary: User Awareness Framework test application +Group: TO_BE/FILLED +Requires: %{name} = %{version}-%{release} + +%description test +This package is for User Awareness Framework CAPI test application + +%if 0%{?gcov:1} +%package gcov +Summary: A User Awareness gcov Tool +Group: Network & Connectivity/Development + +%description gcov +User Awareness gcov objects +%endif + +%prep +%setup -q + +%build + +%if 0%{?gcov:1} +export LDFLAGS+=" -lgcov" +%endif + +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DBIN_INSTALL_DIR=%{_bindir} \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_PATH=%{_lib} \ + -DSUSPEND_RESUME_TEST=%{?ptest:1}%{!?ptest:0} \ + -DFULLVER=%{version} \ + -DMAJORVER=${MAJORVER} \ + -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} + +make %{?jobs:-j%jobs} + +%if 0%{?gcov:1} +mkdir -p gcov-obj +find . -name '*.gcno' -exec cp '{}' gcov-obj ';' +%endif + +%install +%make_install + +%if 0%{?gcov:1} +mkdir -p %{buildroot}%{_datadir}/gcov/obj +install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj +%endif + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%manifest %{name}.manifest +%defattr(-,root,root,-) +%license LICENSE +%attr(644,-,-) %{_libdir}/lib%{name}.so +%attr(644,-,-) %{_libdir}/lib%{name}.so.* + +%files devel +%manifest %{name}-devel.manifest +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/%{name}.pc +%{_includedir}/* + +%files test +%manifest %{name}.manifest +%attr(777,network_fw,network_fw) %{_bindir}/ua-test + +%if 0%{?gcov:1} +%files gcov +%{_datadir}/gcov/obj/* +%endif diff --git a/src/user-awareness-monitors.c b/src/user-awareness-monitors.c index 2c6fc44..4aa57c6 100644 --- a/src/user-awareness-monitors.c +++ b/src/user-awareness-monitors.c @@ -1649,7 +1649,7 @@ int ua_monitor_start_presence_detection( UA_WARN("_uam_get_available_sensors failed"); if (!monitor->internal_presence_started || !monitor->absence_detection_started) { - ret = __ua_start_monitoring(available_sensors, monitor->service, detect); + ret = __ua_start_monitoring(monitor->sensor_bitmask, monitor->service, detect); if (UA_ERROR_NONE != ret) { /* LCOV_EXCL_START */ UA_ERR("Failed with error: %s(0x%X)", @@ -1731,7 +1731,7 @@ int ua_monitor_start_absence_detection( if (UA_ERROR_NONE != _ua_get_error_code( _uam_get_available_sensors(&available_sensors))) UA_WARN("_uam_get_available_sensors failed"); - ret = __ua_start_monitoring(available_sensors, monitor->service, detect); + ret = __ua_start_monitoring(monitor->sensor_bitmask, monitor->service, detect); if (mode == UA_DETECT_MODE_ALL_SENSOR) __ua_monitor_internal_presence_ref(monitor); |