Imported Upstream version 1.0.0

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / bt_edr_adapter / android / caedrnwmonitor.c

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.c b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.c
index e91e415..14fca1e 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.c
@@ -33,7 +33,7 @@
 #include "caedrserver.h"
 #include "caedrutils.h"
 
-#include "org_iotivity_jar_caedrinterface.h"
+#include "org_iotivity_ca_CaEdrInterface.h"
 
 //#define DEBUG_MODE
 #define TAG PCF("CA_EDR_MONITOR")
@@ -61,8 +61,15 @@ CAResult_t CAEDRInitializeNetworkMonitor(const ca_thread_pool_t threadPool)
 {
     OIC_LOG(DEBUG, TAG, "IN");
 
-    CAEDRNetworkMonitorJniInit();
-    CANativeJNIGetJavaVM();
+    if (!threadPool)
+    {
+        return CA_STATUS_FAILED;
+    }
+    else
+    {
+        CAEDRNetworkMonitorJniInit();
+        CANativeJNIGetJavaVM();
+    }
 
     OIC_LOG(DEBUG, TAG, "OUT");
     return CA_STATUS_OK;
@@ -106,15 +113,22 @@ CAResult_t CAEDRClientSetCallbacks(void)
 }
 
 JNIEXPORT void JNICALL
-Java_org_iotivity_jar_caedrinterface_CAEDRStateChangedCallback(JNIEnv *env, jobject obj,
-                                                               jint status)
+Java_org_iotivity_ca_CaEdrInterface_caEdrStateChangedCallback(JNIEnv *env, jobject obj,
+                                                              jint status)
 {
+    if (!env || !obj)
+    {
+        OIC_LOG(ERROR, TAG, "parameter is null");
+        return;
+    }
+
     // STATE_ON:12, STATE_OFF:10
-    OIC_LOG(DEBUG, TAG, "caedrinterface - Network State Changed");
+    OIC_LOG(DEBUG, TAG, "CaEdrInterface - Network State Changed");
 
     if (NULL == g_networkChangeCb)
     {
         OIC_LOG_V(DEBUG, TAG, "gNetworkChangeCb is null", status);
+        return;
     }
 
     jclass jni_cid_BTAdapter = (*env)->FindClass(env, CLASSPATH_BT_ADPATER);
@@ -157,10 +171,16 @@ Java_org_iotivity_jar_caedrinterface_CAEDRStateChangedCallback(JNIEnv *env, jobj
 }
 
 JNIEXPORT void JNICALL
-Java_org_iotivity_jar_caedrinterface_CAEDRBondStateChangedCallback(JNIEnv *env, jobject obj,
-                                                                   jstring addr)
+Java_org_iotivity_ca_CaEdrInterface_caEdrBondStateChangedCallback(JNIEnv *env, jobject obj,
+                                                                  jstring addr)
 {
-    OIC_LOG(DEBUG, TAG, "caedrinterface - Bond State Changed");
+    if (!env || !obj)
+    {
+        OIC_LOG(ERROR, TAG, "parameter is null");
+        return;
+    }
+
+    OIC_LOG(DEBUG, TAG, "CaEdrInterface - Bond State Changed");
 
     if (addr)
     {