diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-05-05 20:58:55 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-05-08 16:04:04 +0300 |
commit | fcbba3c6223f90bee57defa0ce4e38832a5fcde5 (patch) | |
tree | d295687ab02f6ea04a9622ebfebbe8b39dd3a0ff /src/corelib/kernel/qjnihelpers.cpp | |
parent | f94b0e1dd999a6bb8dfa4471fd63c395fc8e2302 (diff) |
Remove unused functions in qjnihelpers
* Remove setNative{Activity,Service} and runOnUiThread functions
which are not used anywhere, probably left overs.
Change-Id: Ic7502dfd50d8eb4a9fa7abbe540a594a3614f14b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/corelib/kernel/qjnihelpers.cpp')
-rw-r--r-- | src/corelib/kernel/qjnihelpers.cpp | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index 219b371441..189a4d8f6a 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -303,32 +303,6 @@ static void setAndroidSdkVersion(JNIEnv *env) g_androidSdkVersion = env->GetStaticIntField(androidVersionClass, androidSDKFieldID); } -static void setNativeActivity(JNIEnv *env, jclass, jobject activity) -{ - if (g_jActivity != 0) - env->DeleteGlobalRef(g_jActivity); - - if (activity != 0) { - g_jActivity = env->NewGlobalRef(activity); - env->DeleteLocalRef(activity); - } else { - g_jActivity = 0; - } -} - -static void setNativeService(JNIEnv *env, jclass, jobject service) -{ - if (g_jService != 0) - env->DeleteGlobalRef(g_jService); - - if (service != 0) { - g_jService = env->NewGlobalRef(service); - env->DeleteLocalRef(service); - } else { - g_jService = 0; - } -} - jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env) { jclass jQtNative = env->FindClass("org/qtproject/qt/android/QtNative"); @@ -389,8 +363,6 @@ jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env) {"runPendingCppRunnables", "()V", reinterpret_cast<void *>(runPendingCppRunnables)}, {"dispatchGenericMotionEvent", "(Landroid/view/MotionEvent;)Z", reinterpret_cast<void *>(dispatchGenericMotionEvent)}, {"dispatchKeyEvent", "(Landroid/view/KeyEvent;)Z", reinterpret_cast<void *>(dispatchKeyEvent)}, - {"setNativeActivity", "(Landroid/app/Activity;)V", reinterpret_cast<void *>(setNativeActivity)}, - {"setNativeService", "(Landroid/app/Service;)V", reinterpret_cast<void *>(setNativeService)}, {"sendRequestPermissionsResult", "(I[Ljava/lang/String;[I)V", reinterpret_cast<void *>(sendRequestPermissionsResult)}, }; @@ -449,15 +421,6 @@ jint QtAndroidPrivate::androidSdkVersion() return g_androidSdkVersion; } -void QtAndroidPrivate::runOnUiThread(QRunnable *runnable, JNIEnv *env) -{ - runOnAndroidThread([runnable]() { - runnable->run(); - if (runnable->autoDelete()) - delete runnable; - }, env); -} - void QtAndroidPrivate::runOnAndroidThread(const QtAndroidPrivate::Runnable &runnable, JNIEnv *env) { QMutexLocker locker(&g_pendingRunnablesMutex); |