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

projects / platform / upstream / iotivity.git / commit

author	jihwan.seo <jihwan.seo@samsung.com>
	Thu, 14 May 2015 10:17:59 +0000 (19:17 +0900)
committer	Erich Keane <erich.keane@intel.com>
	Tue, 26 May 2015 20:03:12 +0000 (20:03 +0000)
commit	6e44d2470f553bccdde26e95cc8cfc19efbcad27
tree	f0af2fb60f9d4c4ac6e5d54605b4b23f428d683b	tree \| snapshot
parent	69f2225b4cee0a4e4be308d32677bc3b95801ace	commit \| diff

replace 'org_iotivity' with 'org_iotivity_ca' and change java file name

- replace 'org_iotivity' with 'org_iotivity_ca'
- change java file name for android callback interface
- android EDR interface code is added
- android BLE code had been separated
  since Gatt Server can be only supported after Android v5.0
  and interface of LE client can only be supported until v4.4
- COPY: <iotivity>resource/csdk/connectivity/samples/android
  /sample_service/src/org/iotivity/ca/< CaEdrInterface.java
  & CaIpInterface.java & CaLeClientInterface.java &
  CaLeServerInterface.java>
  PASTE to: <iotivity>/android/android_api/base/src/main/java
  /org/iotivity/ca/

Change-Id: I77b605313f73f3b2677d05e99a047f541cfcda14
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/990
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

33 files changed:

android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java	[new file with mode: 0644]	blob
android/android_api/base/src/main/java/org/iotivity/ca/CaIpInterface.java		diff \| blob \| history
android/android_api/base/src/main/java/org/iotivity/ca/CaLeClientInterface.java	[new file with mode: 0644]	blob
android/android_api/base/src/main/java/org/iotivity/ca/CaLeServerInterface.java	[new file with mode: 0644]	blob
resource/csdk/connectivity/samples/android/sample_service/AndroidManifest.xml		diff \| blob \| history
resource/csdk/connectivity/samples/android/sample_service/jni/ResourceModel.c		diff \| blob \| history
resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_ca_service_RMInterface.h	[new file with mode: 0644]	blob
resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_service_RMInterface.h	[deleted file]	blob \| history
resource/csdk/connectivity/samples/android/sample_service/res/layout/activity_main.xml		diff \| blob \| history
resource/csdk/connectivity/samples/android/sample_service/res/menu/main.xml		diff \| blob \| history
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/CaEdrInterface.java	[new file with mode: 0644]	blob
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/CaIpInterface.java		diff \| blob \| history
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/CaLeClientInterface.java	[new file with mode: 0644]	blob
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/CaLeServerInterface.java	[new file with mode: 0644]	blob
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/service/DLog.java	[moved from resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/service/DLog.java with 98% similarity]	diff \| blob \| history
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/service/MainActivity.java	[moved from resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/service/MainActivity.java with 99% similarity]	diff \| blob \| history
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/service/RMInterface.java	[moved from resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/service/RMInterface.java with 89% similarity]	diff \| blob \| history
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/jar/CALeInterface.java	[deleted file]	blob \| history
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/jar/caipinterface.java	[deleted file]	blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/android/org_iotivity_ca_CaEdrInterface.h	[new file with mode: 0644]	blob
resource/csdk/connectivity/src/bt_edr_adapter/android/org_iotivity_jar_caedrinterface.h	[deleted file]	blob \| history
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeClientInterface.h	[new file with mode: 0644]	blob
resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeServerInterface.h	[new file with mode: 0644]	blob
resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_jar_caleclientinterface.h	[deleted file]	blob \| history
resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_jar_caleserverinterface.h	[deleted file]	blob \| history
resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/android/org_iotivity_ca_CaIpInterface.h		diff \| blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom