diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-01-16 10:32:30 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-01-20 08:15:46 +0000 |
| commit | 5e0c4d2fa253922a86378b150852a0ca8bdabc0d (patch) | |
| tree | a4a41790cdd313127c650db8a46e6f12a735d654 | |
| parent | d63921355aacf5cbd5189ffdbe4d23b9ff318bee (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: I21a3f7eb43614896536838f83bd5eb6027af64c1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -rw-r--r-- | src/plugins/android/src/qandroidmediaserviceplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp index f441baf0a..a66b85f98 100644 --- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp +++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp @@ -166,7 +166,7 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) UnionJNIEnvToVoid uenv; uenv.venv = NULL; - if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_4) != JNI_OK) + if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_6) != JNI_OK) return JNI_ERR; JNIEnv *jniEnv = uenv.nativeEnvironment; @@ -180,5 +180,5 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) AndroidSurfaceTexture::initJNI(jniEnv); - return JNI_VERSION_1_4; + return JNI_VERSION_1_6; } |