From 66f2a08f8a37933b9eff79ceabdc2cb42706e48c Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 11 Mar 2011 18:34:35 +0000 Subject: 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 --- firmware/target/hosted/android/powermgmt-android.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'firmware/target/hosted/android/powermgmt-android.c') diff --git a/firmware/target/hosted/android/powermgmt-android.c b/firmware/target/hosted/android/powermgmt-android.c index d23fece..222212f 100644 --- a/firmware/target/hosted/android/powermgmt-android.c +++ b/firmware/target/hosted/android/powermgmt-android.c @@ -23,8 +23,8 @@ #include #include #include "config.h" +#include "system.h" -extern JNIEnv *env_ptr; extern jclass RockboxService_class; extern jobject RockboxService_instance; @@ -32,6 +32,8 @@ static jfieldID _battery_level; void powermgmt_init_target(void) { + JNIEnv *env_ptr = getJavaEnvironment(); + jmethodID initBatteryMonitor = (*env_ptr)->GetMethodID(env_ptr, RockboxService_class, "initBatteryMonitor", @@ -50,6 +52,8 @@ void powermgmt_init_target(void) int battery_level(void) { + JNIEnv *env_ptr = getJavaEnvironment(); + return (*env_ptr)->GetIntField(env_ptr, RockboxService_instance, _battery_level); } -- cgit v1.1