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

projects / platform / upstream / iotivity.git / commit

author	Ashok Channa <ashok.channa@samsung.com>
	Thu, 19 Nov 2015 09:55:23 +0000 (18:55 +0900)
committer	Jon A. Cruz <jonc@osg.samsung.com>
	Fri, 19 Feb 2016 02:20:04 +0000 (02:20 +0000)
commit	3461813ef2dcccc04a822b0f2161692d2d7e2c2e
tree	f8e1c0fa151a09ab5d9e93999ac60f03e21a90a1	tree \| snapshot
parent	0394f5d3591a9eb142b3a1b615b566fa0cdc832d	commit \| diff

Merge branch 'nfc-transport'

Change-Id: I9e850b4347ef0027a28dc646f2deb119f1b3f116
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

43 files changed:

android/android_api/base/jni/JniCaInterface.c		diff \| blob \| history
android/android_api/base/jni/JniCaInterface.h		diff \| blob \| history
android/android_api/base/src/main/java/org/iotivity/base/OcConnectivityType.java		diff \| blob \| history
android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java		diff \| blob \| history
android/android_api/base/src/main/java/org/iotivity/base/PlatformConfig.java		diff \| blob \| history
android/android_api/base/src/main/java/org/iotivity/ca/CaInterface.java		diff \| blob \| history
android/android_api/base/src/main/java/org/iotivity/ca/CaNfcInterface.java	[new file with mode: 0644]	blob
android/examples/simpleclient/src/main/AndroidManifest.xml		diff \| blob \| history
android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java		diff \| blob \| history
android/examples/simpleserver/src/main/AndroidManifest.xml		diff \| blob \| history
android/examples/simpleserver/src/main/java/org/iotivity/base/examples/SimpleServer.java		diff \| blob \| history
build_common/SConscript		diff \| blob \| history
resource/csdk/connectivity/SConscript		diff \| blob \| history
resource/csdk/connectivity/api/cacommon.h		diff \| blob \| history
resource/csdk/connectivity/build/android/jni/Android.mk		diff \| blob \| history
resource/csdk/connectivity/inc/caadapterinterface.h		diff \| blob \| history
resource/csdk/connectivity/inc/caadapterutils.h		diff \| blob \| history
resource/csdk/connectivity/inc/canfcadapter.h	[new file with mode: 0644]	blob
resource/csdk/connectivity/inc/canfcinterface.h	[new file with mode: 0644]	blob
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/java/org/iotivity/ca/CaNfcInterface.java	[new file with mode: 0644]	blob
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/AndroidManifest.xml		diff \| blob \| history
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java		diff \| blob \| history
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/RMInterface.java		diff \| blob \| history
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c		diff \| blob \| history
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/org_iotivity_ca_service_RMInterface.h		diff \| blob \| history
resource/csdk/connectivity/src/SConscript		diff \| blob \| history
resource/csdk/connectivity/src/adapter_util/caadapterutils.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c		diff \| blob \| history
resource/csdk/connectivity/src/caconnectivitymanager.c		diff \| blob \| history
resource/csdk/connectivity/src/cainterfacecontroller.c		diff \| blob \| history
resource/csdk/connectivity/src/canetworkconfigurator.c		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/caipadapter.c		diff \| blob \| history
resource/csdk/connectivity/src/nfc_adapter/SConscript	[new file with mode: 0644]	blob
resource/csdk/connectivity/src/nfc_adapter/android/SConscript	[new file with mode: 0644]	blob
resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c	[new file with mode: 0644]	blob
resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c	[new file with mode: 0644]	blob
resource/csdk/connectivity/src/ra_adapter/caraadapter.c		diff \| blob \| history
resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c		diff \| blob \| history
resource/csdk/stack/include/octypes.h		diff \| blob \| history
resource/csdk/stack/src/ocserverrequest.c	[changed mode: 0755->0644]	diff \| blob \| history
resource/csdk/stack/src/ocstack.c		diff \| blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom