summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-01-16 10:30:04 +0200
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-01-20 09:15:20 +0000
commit5885d03a4616d86056d98762bb445867081f2dce (patch)
tree4cdb990c84aa5156aef1d032fcd29e442e62d2ed
parent5ec322a7572fca8cfb3b9d4cb30bcff5fbe6eed1 (diff)
downloadqtlocation-5885d03a4616d86056d98762bb445867081f2dce.tar.gz
Android: JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4
Update instance of old code using JNI_VERSION_1_4 to make the code consistent. Change-Id: Icdb8d152c69f32f1050b51bdb7985acc3364fbf4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r--src/plugins/position/android/src/jnipositioning.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/position/android/src/jnipositioning.cpp b/src/plugins/position/android/src/jnipositioning.cpp
index 0f358b42..4812e307 100644
--- a/src/plugins/position/android/src/jnipositioning.cpp
+++ b/src/plugins/position/android/src/jnipositioning.cpp
@@ -618,7 +618,7 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
uenv.venv = nullptr;
javaVM = nullptr;
- if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_4) != JNI_OK) {
+ if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_6) != JNI_OK) {
__android_log_print(ANDROID_LOG_FATAL, logTag, "GetEnv failed");
return -1;
}
@@ -629,6 +629,6 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
}
javaVM = vm;
- return JNI_VERSION_1_4;
+ return JNI_VERSION_1_6;
}