Merge branch 'master' into easysetup and fixed OCStack issue 92/1392/2
authorMadan Lanka <lanka.madan@samsung.com>
Mon, 22 Jun 2015 06:53:40 +0000 (02:53 -0400)
committerMadan Lanka <lanka.madan@samsung.com>
Tue, 23 Jun 2015 05:13:10 +0000 (05:13 +0000)
commitb029953884356f976a4bdf560a6693bc6bcc115a
tree950df10dc8c1c6281735cca96b967309f086fccf
parent760d0f015661f27042768f8a6e979cf38b91e348
parent2962a98da92f983b750e4dcd554471510384e711
Merge branch 'master' into easysetup and fixed OCStack issue

1) Merged latest master branch code to EasySetup branch
   - Needed as latest Security Layer apis have to integrated to EasySetup branch
2) OCConnectivityType Enum is modified in latest master branch code
   - Changed EasySetup implementation which is using the enum
3) Created json tags for EasySetup json attributes and used it EasySetup implementation
4) Optimized some of the EasySetup implementation
5) Reverted back caipnwmonitor.c modifications performed for resolving the network notification issue in Android
6) Added Broadcast listener code for listening to Android Soft AP enable and disable notification in Android
7) Fixed OCStack memset issue

Conflicts:
resource/csdk/connectivity/SConscript

Change-Id: I9ccd911c560b30aae1e9d5cb6b1356cca947c884
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
13 files changed:
android/android_api/base/src/main/java/org/iotivity/ca/CaIpInterface.java
resource/csdk/connectivity/SConscript
resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c
resource/csdk/stack/src/ocstack.c
service/SConscript
service/easy-setup/SConscript
service/easy-setup/sampleapp/linux/richclient/easysetupsample.cpp
service/easy-setup/sdk/common/common.h
service/easy-setup/sdk/mediator/android/EasySetupCore/AndroidManifest.xml
service/easy-setup/sdk/mediator/android/jni/jni_easy_setup.cpp
service/easy-setup/sdk/mediator/inc/provisioninghandler.h
service/easy-setup/sdk/mediator/src/camutex_pthreads.c
service/easy-setup/sdk/mediator/src/provisioninghandler.cpp