review.tizen.org Git - platform/upstream/iotivity.git/commit

projects / platform / upstream / iotivity.git / commit

author	cc <ch79.cho@samsung.com>
	Fri, 30 Sep 2016 05:37:08 +0000 (14:37 +0900)
committer	Uze Choi <uzchoi@samsung.com>
	Fri, 30 Sep 2016 07:34:52 +0000 (07:34 +0000)
commit	6c75fecbf629a220e0788155395866a2371beace
tree	3899a5ad7ffb9c4aff8f43cdbdbdc53b49efdba6	tree \| snapshot
parent	48aa060db9fda67e8f040d79f6ae648d463cba75	commit \| diff

Merge notification service from master branch

Change-Id: I60d53c447c706b70acd4e19f0b5fb3c3bdcf137a
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

77 files changed:

service/notification/SConscript		diff \| blob \| history
service/notification/android/notification-service/src/main/java/org/iotivity/service/ns/common/Message.java		diff \| blob \| history
service/notification/android/notification-service/src/main/java/org/iotivity/service/ns/provider/ProviderService.java		diff \| blob \| history
service/notification/android/notification-service/src/main/jni/Android.mk		diff \| blob \| history
service/notification/android/notification-service/src/main/jni/common/JniNotificationCommon.cpp		diff \| blob \| history
service/notification/android/notification-service/src/main/jni/common/JniNotificationCommon.h		diff \| blob \| history
service/notification/android/notification-service/src/main/jni/consumer/JniNotificationConsumer.cpp		diff \| blob \| history
service/notification/android/notification-service/src/main/jni/provider/JniNotificationProvider.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/notification/android/notification-service/src/main/jni/provider/JniNotificationProvider.h		diff \| blob \| history
service/notification/cpp-wrapper/common/NSMediaContents.cpp		diff \| blob \| history
service/notification/cpp-wrapper/common/NSMediaContents.h		diff \| blob \| history
service/notification/cpp-wrapper/common/NSMessage.cpp		diff \| blob \| history
service/notification/cpp-wrapper/common/NSMessage.h		diff \| blob \| history
service/notification/cpp-wrapper/common/NSSyncInfo.h		diff \| blob \| history
service/notification/cpp-wrapper/common/NSTopic.h		diff \| blob \| history
service/notification/cpp-wrapper/common/NSTopicsList.cpp		diff \| blob \| history
service/notification/cpp-wrapper/common/NSUtils.h		diff \| blob \| history
service/notification/cpp-wrapper/consumer/SConscript		diff \| blob \| history
service/notification/cpp-wrapper/consumer/inc/NSProvider.h		diff \| blob \| history
service/notification/cpp-wrapper/consumer/src/NSProvider.cpp		diff \| blob \| history
service/notification/cpp-wrapper/examples/linux/SConscript		diff \| blob \| history
service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp		diff \| blob \| history
service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp		diff \| blob \| history
service/notification/cpp-wrapper/provider/SConscript		diff \| blob \| history
service/notification/cpp-wrapper/provider/inc/NSProviderService.h		diff \| blob \| history
service/notification/cpp-wrapper/provider/src/NSProviderService.cpp		diff \| blob \| history
service/notification/cpp-wrapper/unittest/NSConsumerServiceSimulator.h		diff \| blob \| history
service/notification/cpp-wrapper/unittest/NSProviderServiceSimulator.h		diff \| blob \| history
service/notification/examples/android/NotiConsumerExample/app/src/main/java/com/sec/noticonsumerexample/ConsumerProxy.java	[deleted file]	blob \| history
service/notification/examples/android/NotiConsumerExample/app/src/main/java/com/sec/noticonsumerexample/MainActivity.java		diff \| blob \| history
service/notification/examples/android/NotiConsumerExample/app/src/main/res/layout/activity_main.xml		diff \| blob \| history
service/notification/examples/android/NotiConsumerExample/app/src/test/java/com/sec/noticonsumerexample/ExampleUnitTest.java	[deleted file]	blob \| history
service/notification/examples/android/NotiConsumerExample/iotivity-armeabi-notification-service-release/build.gradle	[deleted file]	blob \| history
service/notification/examples/android/NotiConsumerExample/iotivity-base-armeabi-release/build.gradle	[deleted file]	blob \| history
service/notification/examples/android/NotiConsumerExample/settings.gradle		diff \| blob \| history
service/notification/examples/android/NotiProviderExample/app/build.gradle		diff \| blob \| history
service/notification/examples/android/NotiProviderExample/app/src/main/java/com/sec/notiproviderexample/MainActivity.java		diff \| blob \| history
service/notification/examples/android/NotiProviderExample/app/src/main/java/com/sec/notiproviderexample/NotiListener.java		diff \| blob \| history
service/notification/examples/android/NotiProviderExample/app/src/main/java/com/sec/notiproviderexample/ProviderProxy.java	[deleted file]	blob \| history
service/notification/examples/android/NotiProviderExample/app/src/main/res/layout/activity_main.xml		diff \| blob \| history
service/notification/examples/android/NotiProviderExample/app/src/main/res/values/strings.xml		diff \| blob \| history
service/notification/examples/android/NotiProviderExample/app/src/test/java/com/sec/notiproviderexample/ExampleUnitTest.java	[deleted file]	blob \| history
service/notification/examples/android/NotiProviderExample/iotivity-armeabi-notification-service-debug/build.gradle	[deleted file]	blob \| history
service/notification/examples/android/NotiProviderExample/iotivity-base-armeabi-debug/build.gradle	[deleted file]	blob \| history
service/notification/examples/android/NotiProviderExample/settings.gradle		diff \| blob \| history
service/notification/examples/linux/notificationprovider.c		diff \| blob \| history
service/notification/src/common/NSConstants.h		diff \| blob \| history
service/notification/src/common/NSStorageAdapter.h	[deleted file]	blob \| history
service/notification/src/common/NSUtil.c		diff \| blob \| history
service/notification/src/consumer/NSConsumerCommon.c		diff \| blob \| history
service/notification/src/consumer/NSConsumerCommon.h		diff \| blob \| history
service/notification/src/consumer/NSConsumerCommunication.c		diff \| blob \| history
service/notification/src/consumer/NSConsumerDiscovery.c		diff \| blob \| history
service/notification/src/consumer/NSConsumerInternalTaskController.c		diff \| blob \| history
service/notification/src/consumer/NSConsumerInternalTaskController.h		diff \| blob \| history
service/notification/src/consumer/NSConsumerMemoryCache.c		diff \| blob \| history
service/notification/src/consumer/NSConsumerMemoryCache.h		diff \| blob \| history
service/notification/src/consumer/NSConsumerNetworkEventListener.c		diff \| blob \| history
service/notification/src/consumer/NSConsumerQueue.c		diff \| blob \| history
service/notification/src/consumer/NSConsumerQueue.h		diff \| blob \| history
service/notification/src/consumer/NSConsumerScheduler.c		diff \| blob \| history
service/notification/src/provider/NSProviderCallbackResponse.c		diff \| blob \| history
service/notification/src/provider/NSProviderInterface.c		diff \| blob \| history
service/notification/src/provider/NSProviderListener.h		diff \| blob \| history
service/notification/src/provider/NSProviderMemoryCache.c		diff \| blob \| history
service/notification/src/provider/NSProviderMemoryCache.h		diff \| blob \| history
service/notification/src/provider/NSProviderResource.c		diff \| blob \| history
service/notification/src/provider/NSProviderScheduler.c		diff \| blob \| history
service/notification/src/provider/NSProviderSubscription.c		diff \| blob \| history
service/notification/src/provider/NSProviderSubscription.h		diff \| blob \| history
service/notification/src/provider/NSProviderSystem.h		diff \| blob \| history
service/notification/src/provider/NSProviderTopic.c		diff \| blob \| history
service/notification/src/provider/NSProviderTopic.h		diff \| blob \| history
service/notification/unittest/NSConsumerSimulator.h		diff \| blob \| history
service/notification/unittest/NSProviderSimulator.h		diff \| blob \| history
service/notification/unittest/NSProviderTest.cpp		diff \| blob \| history
service/notification/unittest/SConscript		diff \| blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom