C++ mediator changes to keep common code in Provision.cpp file
authorHemant Mahsky <h.mahsky@samsung.com>
Wed, 23 Sep 2015 13:45:16 +0000 (19:15 +0530)
committerMadan Lanka <lanka.madan@samsung.com>
Thu, 24 Sep 2015 08:50:32 +0000 (08:50 +0000)
commit16226bf517020ed0b7beae432f7fe01e46958b89
treeb583bb21c1845dd14d716be81498ea091ea7ca0e
parent22d2dad73e5603542f0010eb55813c857182d74b
C++ mediator changes to keep common code in Provision.cpp file

- Fixed stop enrollee process issue at C++ layer
- Updated Build_Instructions_Android_Arduino.txt with .SO path <iotivity>/service/easy-setup/sdk/mediator/android/libs/armeabi
- Fixed issue for waiting logic, it has to be moved to the EnrolleeDeviceWiFiOnboarding.java from EasySetupService.java as this may not require for all EnrolleeDevice. BLE does not require it.
- Fixed merge conflicts & review comment
- Code formmating

Change-Id: I80b6f79aa1f9b46e3ed33e68d80a685453df2b9d
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2995
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
12 files changed:
service/easy-setup/Build_Instructions_Android_Arduino.txt
service/easy-setup/SConscript
service/easy-setup/sampleapp/mediator/linux/mediator.cpp
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java
service/easy-setup/sdk/mediator/android/jni/jni_easy_setup.cpp
service/easy-setup/sdk/mediator/inc/prov_adapter.h
service/easy-setup/sdk/mediator/inc/provisioning.h
service/easy-setup/sdk/mediator/src/ble_provisioning.cpp
service/easy-setup/sdk/mediator/src/prov_adapter.cpp
service/easy-setup/sdk/mediator/src/provisioning.cpp [new file with mode: 0644]
service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp