diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-01-16 10:27:02 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-01-17 14:01:06 +0000 |
| commit | 00f7f8514f3415bb68d964af18482f47c0d5c94d (patch) | |
| tree | c5366cab2d7f8130f88ba14e4531fcbee7739cc7 | |
| parent | 8159beeeb3290dc1c1b44b5a9792e19f272ad785 (diff) | |
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: I79bf1dc18c45dbdfe6e246e396adcf856dfee63f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/bluetooth/android/jni_android.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/android/jni_android.cpp b/src/bluetooth/android/jni_android.cpp index 0688c869..1ebab74b 100644 --- a/src/bluetooth/android/jni_android.cpp +++ b/src/bluetooth/android/jni_android.cpp @@ -318,7 +318,7 @@ Q_BLUETOOTH_EXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*reserved*/) UnionJNIEnvToVoid uenv; uenv.venv = 0; - 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; } @@ -332,5 +332,5 @@ Q_BLUETOOTH_EXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*reserved*/) if (QT_BT_ANDROID().isDebugEnabled()) __android_log_print(ANDROID_LOG_INFO, logTag, "Bluetooth start"); - return JNI_VERSION_1_4; + return JNI_VERSION_1_6; } |