1 files changed, 21 insertions, 3 deletions
diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp
index 71e2ae9d59..19b7147ba4 100644
--- a/Source/Android/jni/AndroidCommon/IDCache.cpp
+++ b/Source/Android/jni/AndroidCommon/IDCache.cpp
@@ -29,9 +29,27 @@ static jmethodID s_do_rumble;
 
 namespace IDCache
 {
-JavaVM* GetJavaVM()
-{
-  return s_java_vm;
+JNIEnv* GetEnvForThread()
+{
+  thread_local static struct OwnedEnv
+  {
+    OwnedEnv()
+    {
+      status = s_java_vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
+      if (status == JNI_EDETACHED)
+        s_java_vm->AttachCurrentThread(&env, nullptr);
+    }
+
+    ~OwnedEnv()
+    {
+      if (status == JNI_EDETACHED)
+        s_java_vm->DetachCurrentThread();
+    }
+
+    int status;
+    JNIEnv* env = nullptr;
+  } owned;
+  return owned.env;
 }
 
 jclass GetNativeLibraryClass()