diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2011-03-11 18:34:35 +0000 |
|---|---|---|
| committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2011-03-11 18:34:35 +0000 |
| commit | 66f2a08f8a37933b9eff79ceabdc2cb42706e48c (patch) | |
| tree | 704cd88300e33a99335adf1d5e3e4ff6b71a2aed /firmware/target/hosted/android/system-android.c | |
| parent | 2e5b7aebde6426058ea7b69424b0335a844a6a18 (diff) | |
| download | rockbox-66f2a08f8a37933b9eff79ceabdc2cb42706e48c.zip rockbox-66f2a08f8a37933b9eff79ceabdc2cb42706e48c.tar.gz rockbox-66f2a08f8a37933b9eff79ceabdc2cb42706e48c.tar.bz2 rockbox-66f2a08f8a37933b9eff79ceabdc2cb42706e48c.tar.xz | |
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
Diffstat (limited to 'firmware/target/hosted/android/system-android.c')
| -rw-r--r-- | firmware/target/hosted/android/system-android.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c index 66de4e0..f9f0605 100644 --- a/firmware/target/hosted/android/system-android.c +++ b/firmware/target/hosted/android/system-android.c @@ -27,7 +27,7 @@ /* global fields for use with various JNI calls */ -JNIEnv *env_ptr; +JavaVM *vm_ptr; jobject RockboxService_instance; jclass RockboxService_class; @@ -44,8 +44,11 @@ void system_reboot(void) { } void power_off(void) { + JNIEnv *env_ptr = getJavaEnvironment(); + lcd_deinit(); pcm_deinit(); + (*env_ptr)->DeleteGlobalRef(env_ptr, RockboxService_class); } @@ -68,8 +71,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 = (*env)->NewGlobalRef(env, this); RockboxService_class = (*env)->NewGlobalRef(env, class); |