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 --- firmware/target/hosted/android/powermgmt-android.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (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 222212f9c8..d23fece39a 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,8 +32,6 @@ static jfieldID _battery_level; void powermgmt_init_target(void) { - JNIEnv *env_ptr = getJavaEnvironment(); - jmethodID initBatteryMonitor = (*env_ptr)->GetMethodID(env_ptr, RockboxService_class, "initBatteryMonitor", @@ -52,8 +50,6 @@ void powermgmt_init_target(void) int battery_level(void) { - JNIEnv *env_ptr = getJavaEnvironment(); - return (*env_ptr)->GetIntField(env_ptr, RockboxService_instance, _battery_level); } -- cgit