AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Manually detach the thread after calling quitApp.

Browse Source 
On Android 5.0 ART will complain when we don't detach the thread before
the application is about to quit (non-fatal). This is because we
re-attach to call quitApp and then leave it attached.

Change-Id: I4571ef5f38d92afcaf91cb920ebe121a7be7835a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This commit is contained in:
Christian Strømme 2015-05-13 18:35:36 +02:00 committed by Christian Stromme
parent 8fdd1e3867
commit a416647e38
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -443,6 +443,11 @@ static void *startMainMethod(void */*data*/)
if (m_applicationClass) if (m_applicationClass)
QJNIObjectPrivate::callStaticMethod<void>(m_applicationClass, "quitApp", "()V"); QJNIObjectPrivate::callStaticMethod<void>(m_applicationClass, "quitApp", "()V");
// All attached threads should be detached before returning from this function.
JavaVM *vm = QtAndroidPrivate::javaVM();
if (vm != 0)
vm->DetachCurrentThread();
return 0; return 0;
} }