projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.9.2
[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
..
64053cc
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 "caedrserver.h"
#include "caedrutils.h"
-#include "org_iotivity_
jar_caedri
nterface.h"
+#include "org_iotivity_
ca_CaEdrI
nterface.h"
//#define DEBUG_MODE
#define TAG PCF("CA_EDR_MONITOR")
//#define DEBUG_MODE
#define TAG PCF("CA_EDR_MONITOR")
@@
-106,11
+106,11
@@
CAResult_t CAEDRClientSetCallbacks(void)
}
JNIEXPORT void JNICALL
}
JNIEXPORT void JNICALL
-Java_org_iotivity_
jar_caedrinterface_CAEDR
StateChangedCallback(JNIEnv *env, jobject obj,
+Java_org_iotivity_
ca_CaEdrInterface_caEdr
StateChangedCallback(JNIEnv *env, jobject obj,
jint status)
{
// STATE_ON:12, STATE_OFF:10
jint status)
{
// STATE_ON:12, STATE_OFF:10
- OIC_LOG(DEBUG, TAG, "
caedri
nterface - Network State Changed");
+ OIC_LOG(DEBUG, TAG, "
CaEdrI
nterface - Network State Changed");
if (NULL == g_networkChangeCb)
{
if (NULL == g_networkChangeCb)
{
@@
-157,10
+157,10
@@
Java_org_iotivity_jar_caedrinterface_CAEDRStateChangedCallback(JNIEnv *env, jobj
}
JNIEXPORT void JNICALL
}
JNIEXPORT void JNICALL
-Java_org_iotivity_
jar_caedrinterface_CAEDR
BondStateChangedCallback(JNIEnv *env, jobject obj,
+Java_org_iotivity_
ca_CaEdrInterface_caEdr
BondStateChangedCallback(JNIEnv *env, jobject obj,
jstring addr)
{
jstring addr)
{
- OIC_LOG(DEBUG, TAG, "
caedri
nterface - Bond State Changed");
+ OIC_LOG(DEBUG, TAG, "
CaEdrI
nterface - Bond State Changed");
if (addr)
{
if (addr)
{