[Android] Make sure expose events are emitted after window resize

Expose event would not be sent when window was resized

Fixes: QTBUG-69155
Pick-to: 5.15
Change-Id: I81bf2d54f830a0dabf15398e1f25b55ff7ff4479
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>

src/plugins/platforms/android/qandroidplatformopenglwindow.cpp

@@ -107,9 +107,7 @@ void QAndroidPlatformOpenGLWindow::setGeometry(const QRect &rect)
         QtAndroid::setSurfaceGeometry(m_nativeSurfaceId, rect);
 
     QRect availableGeometry = screen()->availableGeometry();
-    if (m_oldGeometry.width() == 0
-            && m_oldGeometry.height() == 0
-            && rect.width() > 0
+    if (rect.width() > 0
             && rect.height() > 0
             && availableGeometry.width() > 0
             && availableGeometry.height() > 0) {

src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp

@@ -84,9 +84,7 @@ void QAndroidPlatformVulkanWindow::setGeometry(const QRect &rect)
         QtAndroid::setSurfaceGeometry(m_nativeSurfaceId, rect);
 
     QRect availableGeometry = screen()->availableGeometry();
-    if (m_oldGeometry.width() == 0
-            && m_oldGeometry.height() == 0
-            && rect.width() > 0
+    if (rect.width() > 0
             && rect.height() > 0
             && availableGeometry.width() > 0
             && availableGeometry.height() > 0) {

tests/auto/gui/kernel/qwindow/BLACKLIST

@@ -19,9 +19,6 @@ osx
 windows-10
 [testInputEvents]
 rhel-7.4
-[exposeEventOnShrink_QTBUG54040]
-# QTBUG-69155
-android
 [initialSize]
 # QTBUG-69159
 android