From 42650d79c149c0e2380917644cfd2c75e09e80be Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 25 Jul 2024 08:33:11 -0700
Subject: [PATCH] Moved Android event initialization to SDL_InitEvents()

---
 src/SDL.c               | 9 ---------
 src/events/SDL_events.c | 6 ++++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/SDL.c b/src/SDL.c
index c5a171e9ea..3cbd3b7684 100644
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -52,7 +52,6 @@
 #include "thread/SDL_thread_c.h"
 #include "video/SDL_pixels_c.h"
 #include "video/SDL_video_c.h"
-#include "video/android/SDL_androidevents.h"
 #include "filesystem/SDL_filesystem_c.h"
 
 #define SDL_INIT_EVERYTHING ~0U
@@ -226,10 +225,6 @@ int SDL_InitSubSystem(Uint32 flags)
 
     SDL_InitMainThread();
 
-#ifdef SDL_PLATFORM_ANDROID
-    Android_InitEvents();
-#endif
-
 #ifdef SDL_USE_LIBDBUS
     SDL_DBus_Init();
 #endif
@@ -576,10 +571,6 @@ void SDL_Quit(void)
     SDL_DBus_Quit();
 #endif
 
-#ifdef SDL_PLATFORM_ANDROID
-    Android_QuitEvents();
-#endif
-
     SDL_SetObjectsInvalid();
     SDL_ClearHints();
     SDL_AssertionsQuit();
diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
index 4fffceb7ac..098bec2b1e 100644
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -1788,6 +1788,9 @@ int SDL_SendSystemThemeChangedEvent(void)
 
 int SDL_InitEvents(void)
 {
+#ifdef SDL_PLATFORM_ANDROID
+    Android_InitEvents();
+#endif
 #ifndef SDL_JOYSTICK_DISABLED
     SDL_AddHintCallback(SDL_HINT_AUTO_UPDATE_JOYSTICKS, SDL_AutoUpdateJoysticksChanged, NULL);
 #endif
@@ -1818,4 +1821,7 @@ void SDL_QuitEvents(void)
 #ifndef SDL_SENSOR_DISABLED
     SDL_DelHintCallback(SDL_HINT_AUTO_UPDATE_SENSORS, SDL_AutoUpdateSensorsChanged, NULL);
 #endif
+#ifdef SDL_PLATFORM_ANDROID
+    Android_QuitEvents();
+#endif
 }