From a55c0e1479264c8efa4e6e89da1b4f116263fa3b Mon Sep 17 00:00:00 2001
From: Sylvain Becker <sylvain.becker@gmail.com>
Date: Tue, 18 Jun 2019 10:23:19 +0200
Subject: [PATCH] Android: revert previous commit (Bug 4669) (Refs #1)

---
 src/core/android/SDL_android.c        | 2 +-
 src/video/android/SDL_androidevents.c | 5 -----
 src/video/android/SDL_androidvideo.c  | 1 -
 src/video/android/SDL_androidvideo.h  | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index 81d7fd429..a4a2e1ce0 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -732,7 +732,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeResize)(
 
     if (Android_Window)
     {
-        Android_send_resize = 1;
+        Android_SendResize(Android_Window);
     }
 
     SDL_UnlockMutex(Android_ActivityMutex);
diff --git a/src/video/android/SDL_androidevents.c b/src/video/android/SDL_androidevents.c
index b0f00c053..de560c96a 100644
--- a/src/video/android/SDL_androidevents.c
+++ b/src/video/android/SDL_androidevents.c
@@ -66,11 +66,6 @@ android_egl_context_restore(SDL_Window *window)
             event.type = SDL_RENDER_DEVICE_RESET;
             SDL_PushEvent(&event);
         }
-
-        if (Android_send_resize) {
-            Android_send_resize = 0;
-            Android_SendResize(window);
-        }
     }
 }
 
diff --git a/src/video/android/SDL_androidvideo.c b/src/video/android/SDL_androidvideo.c
index 41c4bde22..91e6e9973 100644
--- a/src/video/android/SDL_androidvideo.c
+++ b/src/video/android/SDL_androidvideo.c
@@ -69,7 +69,6 @@ static int Android_ScreenRate      = 0;
 SDL_sem *Android_PauseSem          = NULL;
 SDL_sem *Android_ResumeSem         = NULL;
 SDL_mutex *Android_ActivityMutex   = NULL;
-int Android_send_resize            = 0;
 
 static int
 Android_Available(void)
diff --git a/src/video/android/SDL_androidvideo.h b/src/video/android/SDL_androidvideo.h
index 4ee6d6960..ef909967a 100644
--- a/src/video/android/SDL_androidvideo.h
+++ b/src/video/android/SDL_androidvideo.h
@@ -44,7 +44,6 @@ extern int Android_SurfaceWidth;
 extern int Android_SurfaceHeight;
 extern SDL_sem *Android_PauseSem, *Android_ResumeSem;
 extern SDL_mutex *Android_ActivityMutex;
-extern int Android_send_resize;
 
 #endif /* SDL_androidvideo_h_ */