1 files changed, 24 insertions, 7 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
index f0c4a1de2a..d821145973 100644
--- a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
@@ -57,10 +57,6 @@ QT_BEGIN_NAMESPACE
 QAndroidPlatformOpenGLWindow::QAndroidPlatformOpenGLWindow(QWindow *window, EGLDisplay display)
     :QAndroidPlatformWindow(window), m_eglDisplay(display)
 {
-    lockSurface();
-    m_nativeSurfaceId = QtAndroid::createSurface(this, geometry(), bool(window->flags() & Qt::WindowStaysOnTopHint), 32);
-    m_surfaceWaitCondition.wait(&m_surfaceMutex);
-    unlockSurface();
 }
 
 QAndroidPlatformOpenGLWindow::~QAndroidPlatformOpenGLWindow()
@@ -90,13 +86,20 @@ void QAndroidPlatformOpenGLWindow::setGeometry(const QRect &rect)
             && rect.height() > 0
             && availableGeometry.width() > 0
             && availableGeometry.height() > 0) {
-        QWindowSystemInterface::handleExposeEvent(window(), QRegion(rect));
+        QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(0, 0), rect.size()));
     }
 }
 
 EGLSurface QAndroidPlatformOpenGLWindow::eglSurface(EGLConfig config)
 {
     QMutexLocker lock(&m_surfaceMutex);
+
+    if (m_nativeSurfaceId == -1) {
+        const bool windowStaysOnTop = bool(window()->flags() & Qt::WindowStaysOnTopHint);
+        m_nativeSurfaceId = QtAndroid::createSurface(this, geometry(), windowStaysOnTop, 32);
+        m_surfaceWaitCondition.wait(&m_surfaceMutex);
+    }
+
     if (m_eglSurface == EGL_NO_SURFACE) {
         m_surfaceMutex.unlock();
         checkNativeSurface(config);
@@ -117,7 +120,21 @@ void QAndroidPlatformOpenGLWindow::checkNativeSurface(EGLConfig config)
     // we've create another surface, the window should be repainted
     QRect availableGeometry = screen()->availableGeometry();
     if (geometry().width() > 0 && geometry().height() > 0 && availableGeometry.width() > 0 && availableGeometry.height() > 0)
-        QWindowSystemInterface::handleExposeEvent(window(), QRegion(geometry()));
+        QWindowSystemInterface::handleExposeEvent(window(), QRegion(QRect(QPoint(), geometry().size())));
+}
+
+void QAndroidPlatformOpenGLWindow::applicationStateChanged(Qt::ApplicationState state)
+{
+    QAndroidPlatformWindow::applicationStateChanged(state);
+    if (state <=  Qt::ApplicationHidden && QtAndroid::blockEventLoopsWhenSuspended()) {
+        lockSurface();
+        if (m_nativeSurfaceId != -1) {
+            QtAndroid::destroySurface(m_nativeSurfaceId);
+            m_nativeSurfaceId = -1;
+        }
+        clearEgl();
+        unlockSurface();
+    }
 }
 
 void QAndroidPlatformOpenGLWindow::createEgl(EGLConfig config)
@@ -170,7 +187,7 @@ void QAndroidPlatformOpenGLWindow::surfaceChanged(JNIEnv *jniEnv, jobject surfac
     // repaint the window
     QRect availableGeometry = screen()->availableGeometry();
     if (geometry().width() > 0 && geometry().height() > 0 && availableGeometry.width() > 0 && availableGeometry.height() > 0)
-        QWindowSystemInterface::handleExposeEvent(window(), QRegion(geometry()));
+        QWindowSystemInterface::handleExposeEvent(window(), QRegion(QRect(QPoint(), geometry().size())));
 }
 
 QT_END_NAMESPACE