From afd74eb7fb2b2cd3d534cc2fdea31085fb9bb3f5 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Wed, 10 Feb 2021 13:18:43 +0200
Subject: [PATCH] Android: take JavaVM() from QJniEnvironment and not
 QtAndroidPrivate

Task-number: QTBUG-89482
Change-Id: Idfd442afc90c00e672b28b43c78c789813f46c7d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 3348107c038cbac724e33d6bb30671ddddc1505a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/plugin/qlibrary_unix.cpp             | 5 +++--
 src/plugins/platforms/android/androidjnimain.cpp | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
index 95aeee87329..0be3d43e3d2 100644
--- a/src/corelib/plugin/qlibrary_unix.cpp
+++ b/src/corelib/plugin/qlibrary_unix.cpp
@@ -53,7 +53,8 @@
 #endif
 
 #ifdef Q_OS_ANDROID
-#  include <private/qjnihelpers_p.h>
+#include <private/qjnihelpers_p.h>
+#include <QtCore/qjnienvironment.h>
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -244,7 +245,7 @@ bool QLibraryPrivate::load_sys()
             if (hnd) {
                 using JniOnLoadPtr = jint (*)(JavaVM *vm, void *reserved);
                 JniOnLoadPtr jniOnLoad = reinterpret_cast<JniOnLoadPtr>(dlsym(hnd, "JNI_OnLoad"));
-                if (jniOnLoad && jniOnLoad(QtAndroidPrivate::javaVM(), nullptr) == JNI_ERR) {
+                if (jniOnLoad && jniOnLoad(QJniEnvironment::javaVM(), nullptr) == JNI_ERR) {
                     dlclose(hnd);
                     hnd = nullptr;
                 }
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index bdd7f492ac2..df0dcc39a14 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -527,8 +527,8 @@ static jboolean startQtApplication(JNIEnv */*env*/, jclass /*clazz*/)
         args.version = JNI_VERSION_1_6;
         args.name = "QtMainThread";
         args.group = NULL;
-        JavaVM *vm = QtAndroidPrivate::javaVM();
-        if (vm != 0)
+        JavaVM *vm = QJniEnvironment::javaVM();
+        if (vm)
             vm->AttachCurrentThread(&env, &args);
     }