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/nfc/android | |
| parent | 22bffc8c5927d2a6e6b50b05bb6c9db2bc0c7e15 (diff) | |
| parent | 71a0d199a29001cc31bfde15aabcc53cf88aae1e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I64352b6cc066255972874e2f9c28abff35f0d613
Diffstat (limited to 'src/nfc/android')
| -rw-r--r-- | src/nfc/android/androidjninfc.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nfc/android/androidjninfc.cpp b/src/nfc/android/androidjninfc.cpp index 671811c3..4adb6f21 100644 --- a/src/nfc/android/androidjninfc.cpp +++ b/src/nfc/android/androidjninfc.cpp @@ -96,6 +96,11 @@ QT_END_ANDROIDNFC_NAMESPACE Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) { + static bool initialized = false; + if (initialized) + return JNI_VERSION_1_6; + initialized = true; + JNIEnv* env; if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { return -1; |