From e934e22f0110b2cc0ebedca29a490bfbee7da2b6 Mon Sep 17 00:00:00 2001 From: Jaehong Jo Date: Mon, 21 Mar 2016 09:23:00 +0900 Subject: [PATCH] Add activity for NFC Transport. The activity required for the NFC adapter. Change-Id: Id735532944dfb2f496043620c0b7b3230d534957 Signed-off-by: Jaehong Jo Reviewed-on: https://gerrit.iotivity.org/gerrit/6111 Tested-by: jenkins-iotivity Reviewed-by: jihwan seo Reviewed-by: Ashok Babu Channa (cherry picked from commit 40fad8c44605a63a8c4943f5da5f62ea0535caf8) Reviewed-on: https://gerrit.iotivity.org/gerrit/7613 --- .../base/src/main/java/org/iotivity/base/PlatformConfig.java | 6 +++--- .../src/main/java/org/iotivity/base/examples/SimpleClient.java | 1 + .../src/main/java/org/iotivity/base/examples/SimpleServer.java | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/android/android_api/base/src/main/java/org/iotivity/base/PlatformConfig.java b/android/android_api/base/src/main/java/org/iotivity/base/PlatformConfig.java index e298514..487f6a9 100644 --- a/android/android_api/base/src/main/java/org/iotivity/base/PlatformConfig.java +++ b/android/android_api/base/src/main/java/org/iotivity/base/PlatformConfig.java @@ -105,7 +105,7 @@ public class PlatformConfig { * specify port * @param qualityOfService quality of service */ - //Avoid breaking building java samples due to persistent storage SVR DB changes. + // Avoid breaking building java samples due to persistent storage SVR DB changes. public PlatformConfig(Context context, ServiceType serviceType, ModeType modeType, @@ -128,9 +128,9 @@ public class PlatformConfig { * specify port * @param qualityOfService quality of service */ - //Avoid breaking building java samples due to persistent storage SVR DB changes. + // Avoid breaking building java samples due to persistent storage SVR DB changes. public PlatformConfig(Activity activity, - Context context, + Context context, ServiceType serviceType, ModeType modeType, String ipAddress, diff --git a/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java b/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java index e96a444..a9d06a2 100644 --- a/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java +++ b/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java @@ -78,6 +78,7 @@ public class SimpleClient extends Activity implements Context context = this; PlatformConfig platformConfig = new PlatformConfig( + this, context, ServiceType.IN_PROC, ModeType.CLIENT, diff --git a/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/SimpleServer.java b/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/SimpleServer.java index 7c41aea..707e1a1 100644 --- a/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/SimpleServer.java +++ b/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/SimpleServer.java @@ -65,6 +65,7 @@ public class SimpleServer extends Activity { Context context = this; PlatformConfig platformConfig = new PlatformConfig( + this, context, ServiceType.IN_PROC, ModeType.SERVER, -- 2.7.4