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

Remove unused functions in qjnihelpers

Browse Source 
* 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>
This commit is contained in:
Assam Boudjelthia 2021-05-05 20:58:55 +03:00
parent f94b0e1dd9
commit fcbba3c622
3 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/android/jar/src/org/qtproject/qt/android/QtNative.java
View File

@ -1439,9 +1439,6 @@ public class QtNative
public static native void runPendingCppRunnables(); public static native void runPendingCppRunnables();
public static native void sendRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults); public static native void sendRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults);
private static native void setNativeActivity(Activity activity);
private static native void setNativeService(Service service);
// activity methods // activity methods
// service methods // service methods

37
src/corelib/kernel/qjnihelpers.cpp
View File

@ -303,32 +303,6 @@ static void setAndroidSdkVersion(JNIEnv *env)
g_androidSdkVersion = env->GetStaticIntField(androidVersionClass, androidSDKFieldID); 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) jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
{ {
jclass jQtNative = env->FindClass("org/qtproject/qt/android/QtNative"); 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)}, {"runPendingCppRunnables", "()V", reinterpret_cast<void *>(runPendingCppRunnables)},
{"dispatchGenericMotionEvent", "(Landroid/view/MotionEvent;)Z", reinterpret_cast<void *>(dispatchGenericMotionEvent)}, {"dispatchGenericMotionEvent", "(Landroid/view/MotionEvent;)Z", reinterpret_cast<void *>(dispatchGenericMotionEvent)},
{"dispatchKeyEvent", "(Landroid/view/KeyEvent;)Z", reinterpret_cast<void *>(dispatchKeyEvent)}, {"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)}, {"sendRequestPermissionsResult", "(I[Ljava/lang/String;[I)V", reinterpret_cast<void *>(sendRequestPermissionsResult)},
}; };
@ -449,15 +421,6 @@ jint QtAndroidPrivate::androidSdkVersion()
return g_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) void QtAndroidPrivate::runOnAndroidThread(const QtAndroidPrivate::Runnable &runnable, JNIEnv *env)
{ {
QMutexLocker locker(&g_pendingRunnablesMutex); QMutexLocker locker(&g_pendingRunnablesMutex);

1
src/corelib/kernel/qjnihelpers_p.h
View File

@ -124,7 +124,6 @@ namespace QtAndroidPrivate
Q_CORE_EXPORT jint androidSdkVersion(); Q_CORE_EXPORT jint androidSdkVersion();
Q_CORE_EXPORT void runOnAndroidThread(const Runnable &runnable, JNIEnv *env); Q_CORE_EXPORT void runOnAndroidThread(const Runnable &runnable, JNIEnv *env);
Q_CORE_EXPORT void runOnAndroidThreadSync(const Runnable &runnable, JNIEnv *env, int timeoutMs = INT_MAX); Q_CORE_EXPORT void runOnAndroidThreadSync(const Runnable &runnable, JNIEnv *env, int timeoutMs = INT_MAX);
Q_CORE_EXPORT void runOnUiThread(QRunnable *runnable, JNIEnv *env);
Q_CORE_EXPORT void requestPermissions(JNIEnv *env, const QStringList &permissions, const PermissionsResultFunc &callbackFunc, bool directCall = false); Q_CORE_EXPORT void requestPermissions(JNIEnv *env, const QStringList &permissions, const PermissionsResultFunc &callbackFunc, bool directCall = false);
Q_CORE_EXPORT PermissionsHash requestPermissionsSync(JNIEnv *env, const QStringList &permissions, int timeoutMs = INT_MAX); Q_CORE_EXPORT PermissionsHash requestPermissionsSync(JNIEnv *env, const QStringList &permissions, int timeoutMs = INT_MAX);
Q_CORE_EXPORT PermissionsResult checkPermission(const QString &permission); Q_CORE_EXPORT PermissionsResult checkPermission(const QString &permission);