From 5e0c4d2fa253922a86378b150852a0ca8bdabc0d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 16 Jan 2020 10:32:30 +0200 Subject: 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 --- src/plugins/android/src/qandroidmediaserviceplugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/android/src') 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; } -- cgit v1.2.3