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

Simplify setAndroidSdkVersion in qjnihelpers

Browse Source 
Change-Id: Ib4695ffa1443a0b393d152a51a811f4afb163100
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
This commit is contained in:
Assam Boudjelthia 2021-05-05 21:31:16 +03:00
parent b621edddd5
commit 3d430935cf
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,21 +289,10 @@ void QtAndroidPrivate::handleResume()
listeners.at(i)->handleResume(); listeners.at(i)->handleResume();
} }
static void setAndroidSdkVersion(JNIEnv *env)
{
jclass androidVersionClass = env->FindClass("android/os/Build$VERSION");
if (QJniEnvironment::checkAndClearExceptions(env))
return;
jfieldID androidSDKFieldID = env->GetStaticFieldID(androidVersionClass, "SDK_INT", "I");
if (QJniEnvironment::checkAndClearExceptions(env))
return;
g_androidSdkVersion = env->GetStaticIntField(androidVersionClass, androidSDKFieldID);
}
jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env) jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
{ {
g_javaVM = vm;
jclass jQtNative = env->FindClass("org/qtproject/qt/android/QtNative"); jclass jQtNative = env->FindClass("org/qtproject/qt/android/QtNative");
if (QJniEnvironment::checkAndClearExceptions(env)) if (QJniEnvironment::checkAndClearExceptions(env))
@ -344,7 +333,7 @@ jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
if (QJniEnvironment::checkAndClearExceptions(env)) if (QJniEnvironment::checkAndClearExceptions(env))
return JNI_ERR; return JNI_ERR;
setAndroidSdkVersion(env); g_androidSdkVersion = QJniObject::getStaticField<jint>("android/os/Build$VERSION", "SDK_INT");
g_jClassLoader = env->NewGlobalRef(classLoader); g_jClassLoader = env->NewGlobalRef(classLoader);
env->DeleteLocalRef(classLoader); env->DeleteLocalRef(classLoader);
@ -356,7 +345,6 @@ jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
g_jService = env->NewGlobalRef(service); g_jService = env->NewGlobalRef(service);
env->DeleteLocalRef(service); env->DeleteLocalRef(service);
} }
g_javaVM = vm;
static const JNINativeMethod methods[] = { static const JNINativeMethod methods[] = {
{"runPendingCppRunnables", "()V", reinterpret_cast<void *>(runPendingCppRunnables)}, {"runPendingCppRunnables", "()V", reinterpret_cast<void *>(runPendingCppRunnables)},