1 files changed, 16 insertions, 0 deletions

diff --git a/firmware/target/hosted/android/system-target.h b/firmware/target/hosted/android/system-target.h
index 3938ad5fba..9145ab1e84 100644
--- a/firmware/target/hosted/android/system-target.h
+++ b/firmware/target/hosted/android/system-target.h
@@ -21,6 +21,8 @@
 #ifndef __SYSTEM_TARGET_H__
 #define __SYSTEM_TARGET_H__
 
+#include <jni.h>
+
 #define disable_irq()
 #define enable_irq()
 #define disable_irq_save() 0
@@ -30,6 +32,20 @@ void power_off(void);
 void wait_for_interrupt(void);
 void interrupt(void);
 
+/* A JNI environment is specific to its thread, so use the correct way to
+ * obtain it: share a pointer to the JavaVM structure and ask that the JNI
+ * environment attached to the current thread. */
+static inline JNIEnv* getJavaEnvironment(void)
+{
+    extern JavaVM *vm_ptr;
+    JNIEnv *env = NULL;
+
+    if (vm_ptr)
+        (*vm_ptr)->GetEnv(vm_ptr, (void**) &env, JNI_VERSION_1_2);
+
+    return env;
+}
+
 #endif /* __SYSTEM_TARGET_H__ */
 
 #define NEED_GENERIC_BYTESWAPS