2 files changed, 11 insertions, 8 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index 13d41bea99..74edfd8356 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -560,10 +560,15 @@ static void quitQtAndroidPlugin(JNIEnv *env, jclass /*clazz*/)
 static void terminateQt(JNIEnv *env, jclass /*clazz*/)
 {
     // QAndroidEventDispatcherStopper is stopped when the user uses the task manager to kill the application
-    if (!QAndroidEventDispatcherStopper::instance()->stopped()) {
-        sem_wait(&m_terminateSemaphore);
-        sem_destroy(&m_terminateSemaphore);
+    if (QAndroidEventDispatcherStopper::instance()->stopped()) {
+        QAndroidEventDispatcherStopper::instance()->startAll();
+        QCoreApplication::quit();
+        QAndroidEventDispatcherStopper::instance()->goingToStop(false);
     }
+
+    sem_wait(&m_terminateSemaphore);
+    sem_destroy(&m_terminateSemaphore);
+
     env->DeleteGlobalRef(m_applicationClass);
     env->DeleteGlobalRef(m_classLoaderObject);
     if (m_resourcesObj)
@@ -583,10 +588,7 @@ static void terminateQt(JNIEnv *env, jclass /*clazz*/)
     m_androidPlatformIntegration = nullptr;
     delete m_androidAssetsFileEngineHandler;
     m_androidAssetsFileEngineHandler = nullptr;
-
-    if (!QAndroidEventDispatcherStopper::instance()->stopped()) {
-        sem_post(&m_exitSemaphore);
-    }
+    sem_post(&m_exitSemaphore);
 }
 
 static void setSurface(JNIEnv *env, jobject /*thiz*/, jint id, jobject jSurface, jint w, jint h)
diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
index 3e1cfe305d..3de5d30623 100644
--- a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
@@ -47,6 +47,7 @@
 
 #include <QSurfaceFormat>
 #include <QtGui/private/qwindow_p.h>
+#include <QtGui/qguiapplication.h>
 
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformscreen.h>
@@ -121,7 +122,7 @@ void QAndroidPlatformOpenGLWindow::setGeometry(const QRect &rect)
 
 EGLSurface QAndroidPlatformOpenGLWindow::eglSurface(EGLConfig config)
 {
-    if (QAndroidEventDispatcherStopper::stopped())
+    if (QAndroidEventDispatcherStopper::stopped() || QGuiApplication::applicationState() == Qt::ApplicationSuspended)
         return m_eglSurface;
 
     QMutexLocker lock(&m_surfaceMutex);