10 files changed, 50 insertions, 55 deletions

diff --git a/apps/hosted/android/keyboard.c b/apps/hosted/android/keyboard.c
index f9bbcbb261..9407d970fd 100644
--- a/apps/hosted/android/keyboard.c
+++ b/apps/hosted/android/keyboard.c
@@ -26,8 +26,8 @@
 #include "string-extra.h"
 #include "kernel.h"
 #include "lang.h"
-#include "system.h"
 
+extern JNIEnv          *env_ptr;
 static jclass           RockboxKeyboardInput_class;
 static jobject          RockboxKeyboardInput_instance;
 static jmethodID        kbd_inputfunc;
@@ -53,9 +53,7 @@ Java_org_rockbox_RockboxKeyboardInput_put_1result(JNIEnv *env, jobject this,
 
 static void kdb_init(void)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
     JNIEnv e = *env_ptr;
-
     static jmethodID kbd_is_usable;
     if (RockboxKeyboardInput_class == NULL)
     {
@@ -86,7 +84,6 @@ static void kdb_init(void)
 
 int kbd_input(char* text, int buflen)
 {
-    JNIEnv *env_ptr     = getJavaEnvironment();
     JNIEnv e            = *env_ptr;
     jstring str         = e->NewStringUTF(env_ptr, text);
     jstring ok_text     = e->NewStringUTF(env_ptr, str(LANG_KBD_OK));
diff --git a/apps/hosted/android/notification.c b/apps/hosted/android/notification.c
index e7c425b7c1..443200698c 100644
--- a/apps/hosted/android/notification.c
+++ b/apps/hosted/android/notification.c
@@ -29,8 +29,8 @@
 #include "misc.h"
 #include "thread.h"
 #include "debug.h"
-#include "system.h"
 
+extern JNIEnv *env_ptr;
 extern jclass RockboxService_class;
 extern jobject RockboxService_instance;
 
@@ -47,7 +47,6 @@ static const struct dim dim = { .width = 200, .height = 200 };
 static void track_changed_callback(void *param)
 {
     struct mp3entry* id3 = (struct mp3entry*)param;
-    JNIEnv *env_ptr = getJavaEnvironment();
     JNIEnv e = *env_ptr;
     if (id3)
     {
@@ -110,7 +109,6 @@ static void track_changed_callback(void *param)
 static void track_finished_callback(void *param)
 {
     (void)param;
-    JNIEnv *env_ptr = getJavaEnvironment();
     JNIEnv e = *env_ptr;
     e->CallVoidMethod(env_ptr, NotificationManager_instance,
                       finishNotification);
@@ -124,7 +122,6 @@ static void track_finished_callback(void *param)
 
 void notification_init(void)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
     JNIEnv e = *env_ptr;
     jfieldID nNM = e->GetFieldID(env_ptr, RockboxService_class,
                     "fg_runner", "Lorg/rockbox/Helper/RunForegroundManager;");
diff --git a/apps/hosted/android/yesno.c b/apps/hosted/android/yesno.c
index 2e85ea2bc1..f08e7b2dfb 100644
--- a/apps/hosted/android/yesno.c
+++ b/apps/hosted/android/yesno.c
@@ -28,8 +28,8 @@
 #include "settings.h"
 #include "lang.h"
 #include "kernel.h"
-#include "system.h"
 
+extern JNIEnv   *env_ptr;
 static jobject   RockboxYesno_instance = NULL;
 static jmethodID yesno_func;
 static struct semaphore    yesno_done;
@@ -44,7 +44,7 @@ Java_org_rockbox_RockboxYesno_put_1result(JNIEnv *env, jobject this, jboolean re
     semaphore_release(&yesno_done);
 }
 
-static void yesno_init(JNIEnv *env_ptr)
+static void yesno_init(void)
 {
     JNIEnv e = *env_ptr;
     static jmethodID yesno_is_usable;
@@ -74,7 +74,7 @@ static void yesno_init(JNIEnv *env_ptr)
         sleep(HZ/10);
 }
 
-static jstring build_message(JNIEnv *env_ptr, const struct text_message *message)
+jstring build_message(const struct text_message *message)
 {
     char msg[1024] = "";
     JNIEnv e = *env_ptr;
@@ -98,12 +98,10 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
 {
     (void)yes_message;
     (void)no_message;
-    JNIEnv *env_ptr = getJavaEnvironment();
-
-    yesno_init(env_ptr);
-
+    yesno_init();
+    
     JNIEnv e = *env_ptr;
-    jstring message = build_message(env_ptr, main_message);
+    jstring message = build_message(main_message);
     jstring yes = (*env_ptr)->NewStringUTF(env_ptr, str(LANG_SET_BOOL_YES));
     jstring no  = (*env_ptr)->NewStringUTF(env_ptr, str(LANG_SET_BOOL_NO));
 
diff --git a/firmware/target/hosted/android/button-android.c b/firmware/target/hosted/android/button-android.c
index e7a3d00a65..ed1e125223 100644
--- a/firmware/target/hosted/android/button-android.c
+++ b/firmware/target/hosted/android/button-android.c
@@ -29,6 +29,7 @@
 #include "system.h"
 #include "touchscreen.h"
 
+extern JNIEnv *env_ptr;
 static int last_y, last_x;
 static int last_btns;
 
diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c
index 19f077010f..abde72155d 100644
--- a/firmware/target/hosted/android/lcd-android.c
+++ b/firmware/target/hosted/android/lcd-android.c
@@ -28,6 +28,7 @@
 #include "lcd.h"
 #include "button.h"
 
+extern JNIEnv *env_ptr;
 extern jobject RockboxService_instance;
 
 static jobject RockboxFramebuffer_instance;
@@ -90,8 +91,6 @@ void lcd_init_device(void)
 
 void lcd_update(void)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
-
     if (display_on)
         (*env_ptr)->CallVoidMethod(env_ptr, RockboxFramebuffer_instance,
                                    java_lcd_update);
@@ -99,8 +98,6 @@ void lcd_update(void)
 
 void lcd_update_rect(int x, int y, int width, int height)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
-
     if (display_on)
         (*env_ptr)->CallVoidMethod(env_ptr, RockboxFramebuffer_instance,
                                    java_lcd_update_rect, x, y, width, height);
diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c
index 24881bd3df..edb3503262 100644
--- a/firmware/target/hosted/android/pcm-android.c
+++ b/firmware/target/hosted/android/pcm-android.c
@@ -21,10 +21,13 @@
 
 #include <jni.h>
 #include <stdbool.h>
+#define _SYSTEM_WITH_JNI /* for getJavaEnvironment */
 #include <system.h>
 #include "debug.h"
 #include "pcm.h"
 
+extern JNIEnv *env_ptr;
+
 /* infos about our pcm chunks */
 static size_t  pcm_data_size;
 static char   *pcm_data_start;
@@ -115,17 +118,17 @@ void pcm_play_dma_start(const void *addr, size_t size)
 
 void pcm_play_dma_stop(void)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
-
-    (*env_ptr)->CallVoidMethod(env_ptr,
-                               RockboxPCM_instance,
-                               stop_method);
+    /* NOTE: due to how pcm_play_get_more_callback() works, this is
+     * possibly called from pcmSamplesToByteArray(), i.e. another thread.
+     * => We need to discover the env_ptr */
+    JNIEnv* env = getJavaEnvironment();
+    (*env)->CallVoidMethod(env,
+                           RockboxPCM_instance,
+                           stop_method);
 }
 
 void pcm_play_dma_pause(bool pause)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
-
     (*env_ptr)->CallVoidMethod(env_ptr,
                                RockboxPCM_instance,
                                play_pause_method,
@@ -154,7 +157,6 @@ void pcm_play_dma_init(void)
      * Luckily we only reference the PCM object from here, so it's safe (and
      * clean) to allocate it here
      **/
-    JNIEnv *env_ptr = getJavaEnvironment();
     JNIEnv e = *env_ptr;
     /* get the class and its constructor */
     jclass RockboxPCM_class = e->FindClass(env_ptr, "org/rockbox/RockboxPCM");
@@ -175,8 +177,6 @@ void pcm_postinit(void)
 
 void pcm_set_mixer_volume(int volume)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
-
     (*env_ptr)->CallVoidMethod(env_ptr, RockboxPCM_instance, set_volume_method, volume);
 }
 
diff --git a/firmware/target/hosted/android/powermgmt-android.c b/firmware/target/hosted/android/powermgmt-android.c
index 222212f9c8..d23fece39a 100644
--- a/firmware/target/hosted/android/powermgmt-android.c
+++ b/firmware/target/hosted/android/powermgmt-android.c
@@ -23,8 +23,8 @@
 #include <jni.h>
 #include <stdbool.h>
 #include "config.h"
-#include "system.h"
 
+extern JNIEnv *env_ptr;
 extern jclass  RockboxService_class;
 extern jobject RockboxService_instance;
 
@@ -32,8 +32,6 @@ static jfieldID _battery_level;
 
 void powermgmt_init_target(void)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
-
     jmethodID initBatteryMonitor = (*env_ptr)->GetMethodID(env_ptr,
                                                            RockboxService_class,
                                                            "initBatteryMonitor",
@@ -52,8 +50,6 @@ void powermgmt_init_target(void)
 
 int battery_level(void)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
-
     return (*env_ptr)->GetIntField(env_ptr, RockboxService_instance, _battery_level);
 }
 
diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c
index 8d36198c61..686453cfbb 100644
--- a/firmware/target/hosted/android/system-android.c
+++ b/firmware/target/hosted/android/system-android.c
@@ -27,7 +27,8 @@
 
 
 /* global fields for use with various JNI calls */
-JavaVM *vm_ptr;
+static JavaVM *vm_ptr;
+JNIEnv *env_ptr;
 jobject RockboxService_instance;
 jclass  RockboxService_class;
 
@@ -47,6 +48,22 @@ void system_init(void)
     telephony_init_device();
 }
 
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM *vm, void* reserved)
+{
+    (void)reserved;
+    vm_ptr = vm;
+
+    return JNI_VERSION_1_2;
+}
+
+JNIEnv* getJavaEnvironment(void)
+{
+    JNIEnv* env;
+    (*vm_ptr)->GetEnv(vm_ptr, (void**) &env, JNI_VERSION_1_2);
+    return env;
+}
+
 /* this is the entry point of the android app initially called by jni */
 JNIEXPORT void JNICALL
 Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
@@ -58,8 +75,8 @@ Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
 
     volatile uintptr_t stack = 0;
     stackbegin = stackend = (uintptr_t*) &stack;
+    env_ptr = env;
 
-    (*env)->GetJavaVM(env, &vm_ptr);
     RockboxService_instance = this;
     RockboxService_class = (*env)->GetObjectClass(env, this);
 
diff --git a/firmware/target/hosted/android/system-target.h b/firmware/target/hosted/android/system-target.h
index 9145ab1e84..325c1012af 100644
--- a/firmware/target/hosted/android/system-target.h
+++ b/firmware/target/hosted/android/system-target.h
@@ -21,8 +21,6 @@
 #ifndef __SYSTEM_TARGET_H__
 #define __SYSTEM_TARGET_H__
 
-#include <jni.h>
-
 #define disable_irq()
 #define enable_irq()
 #define disable_irq_save() 0
@@ -32,19 +30,15 @@ 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;
-}
+ /* don't pull in jni.h for every user of this file, it should be only needed
+  * within the target tree (if at all)
+  * define this before #including system.h or system-target.h */
+#ifdef _SYSTEM_WITH_JNI
+#include <jni.h>
+/*
+ * discover the JNIEnv for this the calling thread in case it's not known */
+extern JNIEnv* getJavaEnvironment(void);
+#endif /* _SYSTEM_WITH_JNI */
 
 #endif /* __SYSTEM_TARGET_H__ */
 
diff --git a/firmware/target/hosted/android/telephony-android.c b/firmware/target/hosted/android/telephony-android.c
index fb2dc37623..64ad436ca7 100644
--- a/firmware/target/hosted/android/telephony-android.c
+++ b/firmware/target/hosted/android/telephony-android.c
@@ -22,16 +22,14 @@
 
 #include <jni.h>
 #include "kernel.h"
-#include "system.h"
 
+extern JNIEnv *env_ptr;
 extern jobject RockboxService_instance;
 
 
 void telephony_init_device(void)
 {
-    JNIEnv *env_ptr = getJavaEnvironment();
     JNIEnv e = *env_ptr;
-
     jclass class = e->FindClass(env_ptr, "org/rockbox/RockboxTelephony");
     jmethodID constructor = e->GetMethodID(env_ptr, class, "<init>", "(Landroid/content/Context;)V");