summaryrefslogtreecommitdiffstats
path: root/jni/com_android_bluetooth_btservice_AdapterService.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'jni/com_android_bluetooth_btservice_AdapterService.cpp')
-rwxr-xr-xjni/com_android_bluetooth_btservice_AdapterService.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index 2af399b85..a9c276f93 100755
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -496,6 +496,8 @@ static bool cleanupNative(JNIEnv *env, jobject obj) {
if (!sBluetoothInterface) return result;
sBluetoothInterface->cleanup();
+ LOGV("%s: return from cleanup",__FUNCTION__);
+
env->DeleteGlobalRef(sJniCallbacksObj);
return JNI_TRUE;
}
@@ -837,7 +839,7 @@ static int createSocketChannelNative(JNIEnv *env, jobject object, jint type,
LOGE("failed to get uuid");
goto Fail;
}
-
+ LOGE("SOCK FLAG = %x ***********************",flag);
if ( (status = sBluetoothSocketInterface->listen((btsock_type_t) type, service_name,
(const uint8_t*) uuid, channel, &socket_fd, flag)) != BT_STATUS_SUCCESS) {
LOGE("Socket listen failed: %d", status);
@@ -934,5 +936,10 @@ jint JNI_OnLoad(JavaVM *jvm, void *reserved)
return JNI_ERR;
}
+ if ((status = android::register_com_android_bluetooth_pan(e)) < 0) {
+ LOGE("jni pan registration failure: %d", status);
+ return JNI_ERR;
+ }
+
return JNI_VERSION_1_6;
}