diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-05-11 14:23:45 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-05-13 01:41:36 +0300 |
| commit | 23780891a50ba678714f7e0a4cf43a0f8164b440 (patch) | |
| tree | 6dace90d624f15f1e456f4d8294cb67beab1e9d4 /src | |
| parent | 320c282488f4ae4cae735b0be027170803d06cd7 (diff) | |
Add tests for QAndroidApplication's sdkVersion and activity
While at it, move tst_android under corelib/platform/android.
Change-Id: Icf91cd75cb5e04d03fe6a81d52fba52a485ca41f
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qjnihelpers.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index 078b59897e..edb07b47cf 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -72,7 +72,6 @@ static JavaVM *g_javaVM = nullptr; static jobject g_jActivity = nullptr; static jobject g_jService = nullptr; static jobject g_jClassLoader = nullptr; -static jint g_androidSdkVersion = 0; static jclass g_jNativeClass = nullptr; static jmethodID g_runPendingCppRunnablesMethodID = nullptr; Q_GLOBAL_STATIC(std::deque<QtAndroidPrivate::Runnable>, g_pendingRunnables); @@ -333,8 +332,6 @@ jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env) if (QJniEnvironment::checkAndClearExceptions(env)) return JNI_ERR; - g_androidSdkVersion = QJniObject::getStaticField<jint>("android/os/Build$VERSION", "SDK_INT"); - g_jClassLoader = env->NewGlobalRef(classLoader); env->DeleteLocalRef(classLoader); if (activity) { @@ -404,7 +401,10 @@ jobject QtAndroidPrivate::classLoader() jint QtAndroidPrivate::androidSdkVersion() { - return g_androidSdkVersion; + static jint sdkVersion = 0; + if (!sdkVersion) + sdkVersion = QJniObject::getStaticField<jint>("android/os/Build$VERSION", "SDK_INT"); + return sdkVersion; } void QtAndroidPrivate::runOnAndroidThread(const QtAndroidPrivate::Runnable &runnable, JNIEnv *env) |