From 046cec3aa7fd58a9519cad8d693b47a2400e1742 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Wed, 16 Mar 2011 14:33:55 +0000 Subject: Android: Partly revert r29569 and only call the new getJavaEnvironment() when needed. The environment is fine to share in general, just not across OS threads, so it's only needed for functions which are possibly called from multiple OS threads (only 1 currently). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29601 a1c6a512-1295-4272-9138-f99709370657 --- apps/hosted/android/keyboard.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'apps/hosted/android/keyboard.c') 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)); -- cgit v1.2.3