From efd665e2c708654e9c6d1e03d740a2d02f03e5e0 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Mon, 5 Oct 2020 13:56:45 -0400
Subject: [PATCH] Backed out changeset a43cb4e54949

Trying this a different way.
---
 src/core/android/SDL_android.c | 5 -----
 src/core/android/SDL_android.h | 2 --
 src/misc/SDL_url.c             | 1 +
 src/misc/android/SDL_sysurl.c  | 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 478fdcc98..f8c02ea1d 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -2284,11 +2284,6 @@ void *SDL_AndroidGetActivity(void)
     return (*env)->CallStaticObjectMethod(env, mActivityClass, midGetContext);
 }
 
-jclass Android_GetActivityClass(void)
-{
-    return mActivityClass;
-}
-
 int SDL_GetAndroidSDKVersion(void)
 {
     static int sdk_version;
diff --git a/src/core/android/SDL_android.h b/src/core/android/SDL_android.h
index 4398060b1..153105199 100644
--- a/src/core/android/SDL_android.h
+++ b/src/core/android/SDL_android.h
@@ -140,8 +140,6 @@ void Android_ActivityMutex_Lock(void);
 void Android_ActivityMutex_Unlock(void);
 void Android_ActivityMutex_Lock_Running(void);
 
-jclass Android_GetActivityClass(void);
-
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
 /* *INDENT-OFF* */
diff --git a/src/misc/SDL_url.c b/src/misc/SDL_url.c
index fedbae3e5..13f914fd3 100644
--- a/src/misc/SDL_url.c
+++ b/src/misc/SDL_url.c
@@ -18,6 +18,7 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+
 #include "../SDL_internal.h"
 #include "SDL_misc.h"
 #include "SDL_error.h"
diff --git a/src/misc/android/SDL_sysurl.c b/src/misc/android/SDL_sysurl.c
index 093a0ec96..6ee5f8b23 100644
--- a/src/misc/android/SDL_sysurl.c
+++ b/src/misc/android/SDL_sysurl.c
@@ -25,7 +25,6 @@
 int
 SDL_SYS_OpenURL(const char *url)
 {
-    jclass mActivityClass = Android_GetActivityClass();
     JNIEnv *env = Android_JNI_GetEnv();
     jstring jurl = (*env)->NewStringUTF(env, url);
     const int ret = (*env)->CallStaticIntMethod(env, mActivityClass, midOpenURL, jurl);