From b7f24ec07fd38a5e4d9f6bad6b2d2429d85eaa86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tinja=20Paavosepp=C3=A4?= Date: Tue, 22 Oct 2024 15:45:30 +0300 Subject: [PATCH] Android: Remove unused ClassLoader reference Task-number: QTBUG-130610 Change-Id: Ide5d1539f6c608a6d031d28d1942b55b0e9b5407 Reviewed-by: Petri Virkkunen Reviewed-by: Assam Boudjelthia (cherry picked from commit 1a6efa0728c03979096dbd669d1244fd715a8f26) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/android/androidjnimain.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index f90093a837c..fa7a342b8e1 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -47,8 +47,6 @@ QT_BEGIN_NAMESPACE static JavaVM *m_javaVM = nullptr; static jclass m_applicationClass = nullptr; -static jobject m_classLoaderObject = nullptr; -static jmethodID m_loadClassMethodID = nullptr; static AAssetManager *m_assetManager = nullptr; static jobject m_assets = nullptr; static jobject m_resourcesObj = nullptr; @@ -513,7 +511,6 @@ static void terminateQt(JNIEnv *env, jclass /*clazz*/) sem_destroy(&m_terminateSemaphore); env->DeleteGlobalRef(m_applicationClass); - env->DeleteGlobalRef(m_classLoaderObject); if (m_resourcesObj) env->DeleteGlobalRef(m_resourcesObj); if (m_bitmapClass) @@ -828,11 +825,6 @@ static bool registerNatives(QJniEnvironment &env) env->DeleteLocalRef(contextObject); }); - GET_AND_CHECK_STATIC_METHOD(methodID, m_applicationClass, "classLoader", "()Ljava/lang/ClassLoader;"); - m_classLoaderObject = env->NewGlobalRef(env->CallStaticObjectMethod(m_applicationClass, methodID)); - clazz = env->GetObjectClass(m_classLoaderObject); - GET_AND_CHECK_METHOD(m_loadClassMethodID, clazz, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;"); - FIND_AND_CHECK_CLASS("android/content/ContextWrapper"); GET_AND_CHECK_METHOD(methodID, clazz, "getAssets", "()Landroid/content/res/AssetManager;"); m_assets = env->NewGlobalRef(env->CallObjectMethod(contextObject, methodID));