Imported Upstream version 0.9.2

[platform/upstream/iotivity.git] / android / android_api / base / jni / JniOcPlatform.h

diff --git a/android/android_api/base/jni/JniOcPlatform.h b/android/android_api/base/jni/JniOcPlatform.h
index 1019147..ca7051e 100644 (file)
--- a/android/android_api/base/jni/JniOcPlatform.h
+++ b/android/android_api/base/jni/JniOcPlatform.h
@@ -22,6 +22,7 @@
 #include "JniOcStack.h"\r
 #include "JniOnResourceFoundListener.h"\r
 #include "JniOnDeviceInfoListener.h"\r
+#include "JniOnPlatformInfoListener.h"
 #include "JniOnPresenceListener.h"\r
 #include <mutex>\r
 \r
@@ -36,15 +37,20 @@ void RemoveOnResourceFoundListener(JNIEnv* env, jobject jListener);
 JniOnDeviceInfoListener* AddOnDeviceInfoListener(JNIEnv* env, jobject jListener);\r
 void RemoveOnDeviceInfoListener(JNIEnv* env, jobject jListener);\r
 \r
+JniOnPlatformInfoListener* AddOnPlatformInfoListener(JNIEnv* env, jobject jListener);
+void RemoveOnPlatformInfoListener(JNIEnv* env, jobject jListener);
+
 JniOnPresenceListener* AddOnPresenceListener(JNIEnv* env, jobject jListener);\r
 void RemoveOnPresenceListener(JNIEnv* env, jobject jListener);\r
 \r
 std::map<jobject, std::pair<JniOnResourceFoundListener*, int>> onResourceFoundListenerMap;\r
 std::map<jobject, std::pair<JniOnDeviceInfoListener*, int>> onDeviceInfoListenerMap;\r
+std::map<jobject, std::pair<JniOnPlatformInfoListener*, int>> onPlatformInfoListenerMap;
 std::map<jobject, std::pair<JniOnPresenceListener*, int>> onPresenceListenerMap;\r
 \r
 std::mutex resourceFoundMapLock;\r
 std::mutex deviceInfoMapLock;\r
+std::mutex platformInfoMapLock;
 std::mutex presenceMapLock;\r
 \r
 #ifdef __cplusplus\r
@@ -56,7 +62,7 @@ extern "C" {
     * Signature: (IILjava/lang/String;II)V\r
     */\r
     JNIEXPORT void JNICALL Java_org_iotivity_base_OcPlatform_configure\r
-        (JNIEnv *, jclass, jint, jint, jstring, jint, jint);\r
+        (JNIEnv *, jclass, jint, jint, jstring, jint, jint, jstring);
 \r
     /*\r
     * Class:     org_iotivity_base_OcPlatform\r
@@ -120,6 +126,22 @@ extern "C" {
     * Signature: (Ljava/lang/String;Ljava/lang/String;ILorg/iotivity/base/OcPlatform/OnDeviceFoundListener;I)V\r
     */\r
     JNIEXPORT void JNICALL Java_org_iotivity_base_OcPlatform_getDeviceInfo1\r
+        (JNIEnv *, jclass, jstring, jstring, jint, jobject, jint);
+
+    /*
+     * Class:     org_iotivity_base_OcPlatform
+     * Method:    getPlatformInfo0
+     * Signature: (Ljava/lang/String;Ljava/lang/String;ILorg/iotivity/base/OcPlatform/OnPlatformFoundListener;)V
+     */
+     JNIEXPORT void JNICALL Java_org_iotivity_base_OcPlatform_getPlatformInfo0
+        (JNIEnv *, jclass, jstring, jstring, jint, jobject);
+
+    /*
+     * Class:     org_iotivity_base_OcPlatform
+     * Method:    getPlatformInfo1
+     * Signature: (Ljava/lang/String;Ljava/lang/String;ILorg/iotivity/base/OcPlatform/OnPlatformFoundListener;I)V
+     */
+     JNIEXPORT void JNICALL Java_org_iotivity_base_OcPlatform_getPlatformInfo1
         (JNIEnv *, jclass, jstring, jstring, jint, jobject, jint);\r
 \r
     /*\r
@@ -141,10 +163,18 @@ extern "C" {
     /*\r
     * Class:     org_iotivity_base_OcPlatform\r
     * Method:    registerDeviceInfo0\r
-    * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V\r
+    * Signature: (Ljava/lang/String;)V
     */\r
     JNIEXPORT void JNICALL Java_org_iotivity_base_OcPlatform_registerDeviceInfo0\r
-        (JNIEnv *, jclass, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring);\r
+        (JNIEnv *, jclass, jstring);
+
+    /*
+    * Class:     org_iotivity_base_OcPlatform
+    * Method:    registerPlatformInfo0
+    * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    */
+    JNIEXPORT void JNICALL Java_org_iotivity_base_OcPlatform_registerPlatformInfo0
+        (JNIEnv *, jclass, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring);
 \r
     /*\r
     * Class:     org_iotivity_base_OcPlatform\r
@@ -262,3 +292,4 @@ extern "C" {
 }\r
 #endif\r
 #endif\r
+