devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

14
apps/hosted/android/yesno.c
View file

@ -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(void)
static void yesno_init(JNIEnv *env_ptr)
{
JNIEnv e = *env_ptr;
static jmethodID yesno_is_usable;
@ -75,7 +75,7 @@ static void yesno_init(void)
sleep(HZ/10);
}
jstring build_message(const struct text_message *message)
static jstring build_message(JNIEnv *env_ptr, const struct text_message *message)
{
char msg[1024] = "";
JNIEnv e = *env_ptr;
@ -99,10 +99,12 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
{
(void)yes_message;
(void)no_message;
yesno_init();
JNIEnv *env_ptr = getJavaEnvironment();
yesno_init(env_ptr);
JNIEnv e = *env_ptr;
jstring message = build_message(main_message);
jstring message = build_message(env_ptr, 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));