1
0
Fork 0
forked from len0rd/rockbox

Android: Don't share the JNI environment across threads, but obtain it the

correct way

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29569 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2011-03-11 18:34:35 +00:00
parent 2e5b7aebde
commit 66f2a08f8a
10 changed files with 60 additions and 16 deletions

View file

@ -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,7 +53,9 @@ 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)
{
@ -87,6 +89,7 @@ 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));