From: Mu-Woong Lee Date: Tue, 3 May 2016 01:51:14 +0000 (+0900) Subject: Merge branch 'devel/tizen_3.0' into tizen X-Git-Tag: submit/tizen/20160503.015801^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F68177%2F1;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git Merge branch 'devel/tizen_3.0' into tizen * devel/tizen_3.0: (34 commits) Version 0.8.0 Add the missing trigger template for wifi state Mark contacts, headphone, message providers as non-unloadable. Switch to gmodule from linux dl functions Temporally disable my-place detector before merging into tizen branch Break the direct dependency to media-content from the media stats provider Remove daily timer of the social stats logger Fix the linking issue of libctx-prvd-social-stats.so to _contacts_phone_log Add comments on the subscribe/unsubscribe functions of PlaceRecognitionProvider Implement getPrivilege() functions Re-implement 'create' functions to support dynamic loading Align the lib directory path with the header path Add a header file for listing so file names & trigger templates Split the .a file into .so files Code cleanup: merge geofence-related macros into ProviderTypes.h Code cleanup: update provider class names Code cleanup: merge activity-related macros into ProviderTypes.h Code cleanup: merge common, system, social types into one provider types header Code cleanup: activity providers Separate util functions in BasicProvider to the namespace ctx::util ... Signed-off-by: Mu-Woong Lee Conflicts: src/device/CMakeLists.txt Change-Id: I87ae2cd629eea79987652728efc7ea4f71a18fe1 --- 100defd9e3fc118378bb05673e777da1038e9d45