diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:14:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:14:42 +0200 |
| commit | 60d1ebac9e81619a24e66fc6defc3e0299491a9d (patch) | |
| tree | 39cc5bfb0f6f5b22b0d0a2e71d92ac7e9e69d0e7 /src/bluetooth/android | |
| parent | 22bffc8c5927d2a6e6b50b05bb6c9db2bc0c7e15 (diff) | |
| parent | 71a0d199a29001cc31bfde15aabcc53cf88aae1e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I64352b6cc066255972874e2f9c28abff35f0d613
Diffstat (limited to 'src/bluetooth/android')
| -rw-r--r-- | src/bluetooth/android/jni_android.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bluetooth/android/jni_android.cpp b/src/bluetooth/android/jni_android.cpp index b48cd21f..95011c6c 100644 --- a/src/bluetooth/android/jni_android.cpp +++ b/src/bluetooth/android/jni_android.cpp @@ -284,6 +284,11 @@ static bool registerNatives(JNIEnv *env) Q_BLUETOOTH_EXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*reserved*/) { + static bool initialized = false; + if (initialized) + return JNI_VERSION_1_6; + initialized = true; + typedef union { JNIEnv *nativeEnvironment; void *venv; |