1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Remove redundant JavaVM reference

Browse Source 
Task-number: QTBUG-130610
Change-Id: I788a3789b5a5b178b97b5a2c9b7568a7d925e1a8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit c95426619f5788be03c6111c3b21db46b234921a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tinja Paavoseppä 2024-10-22 16:14:50 +03:00 committed by Qt Cherry-pick Bot
parent 371f603b94
commit e4d5537775
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -45,7 +45,6 @@ using namespace Qt::StringLiterals;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
static JavaVM *m_javaVM = nullptr;
static jclass m_applicationClass = nullptr; static jclass m_applicationClass = nullptr;
static AAssetManager *m_assetManager = nullptr; static AAssetManager *m_assetManager = nullptr;
static jobject m_assets = nullptr; static jobject m_assets = nullptr;
@ -164,11 +163,6 @@ namespace QtAndroid
return m_density; return m_density;
} }
JavaVM *javaVM()
{
return m_javaVM;
}
AAssetManager *assetManager() AAssetManager *assetManager()
{ {
return m_assetManager; return m_assetManager;
@ -860,7 +854,7 @@ static bool registerNatives(QJniEnvironment &env)
QT_END_NAMESPACE QT_END_NAMESPACE
Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/) Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM */*vm*/, void */*reserved*/)
{ {
static bool initialized = false; static bool initialized = false;
if (initialized) if (initialized)
@ -868,10 +862,8 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
initialized = true; initialized = true;
QT_USE_NAMESPACE QT_USE_NAMESPACE
m_javaVM = vm;
QJniEnvironment env; QJniEnvironment env;
if (!env.isValid()) { if (!env.isValid()) {
m_javaVM = nullptr;
__android_log_print(ANDROID_LOG_FATAL, "Qt", "Failed to initialize the JNI Environment"); __android_log_print(ANDROID_LOG_FATAL, "Qt", "Failed to initialize the JNI Environment");
return -1; return -1;
} }

1
src/plugins/platforms/android/androidjnimain.h
View File

@ -45,7 +45,6 @@ namespace QtAndroid
int availableHeightPixels(); int availableHeightPixels();
double scaledDensity(); double scaledDensity();
double pixelDensity(); double pixelDensity();
JavaVM *javaVM();
jobject assets(); jobject assets();
AAssetManager *assetManager(); AAssetManager *assetManager();
jclass applicationClass(); jclass applicationClass();

2
src/plugins/platforms/android/qandroidplatformintegration.cpp
View File

@ -83,7 +83,7 @@ static bool isValidAndroidContextForRendering()
void *QAndroidPlatformNativeInterface::nativeResourceForIntegration(const QByteArray &resource) void *QAndroidPlatformNativeInterface::nativeResourceForIntegration(const QByteArray &resource)
{ {
if (resource=="JavaVM") if (resource=="JavaVM")
return QtAndroid::javaVM(); return QtAndroidPrivate::javaVM();
if (resource == "QtActivity") { if (resource == "QtActivity") {
extern Q_CORE_EXPORT jobject qt_androidActivity(); extern Q_CORE_EXPORT jobject qt_androidActivity();
return qt_androidActivity(); return qt_androidActivity();