From 33de9cdaefd8684e3411486612e68c0c2bd6be3d Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 18 Jul 2011 21:02:47 +0000 Subject: Android: Refactor some of the glue code. * Cleanup RockboxService.java by moving the battery and headphone monitors to separate classes and detaching their instances * Move those monitors and RockboxTelephony.java into a new monitors subdirectory * Call those monitors all the same from native code by creating the objects there git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30160 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/hosted/android/telephony-android.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'firmware/target/hosted/android/telephony-android.c') diff --git a/firmware/target/hosted/android/telephony-android.c b/firmware/target/hosted/android/telephony-android.c index 64ad436ca7..df89a56e14 100644 --- a/firmware/target/hosted/android/telephony-android.c +++ b/firmware/target/hosted/android/telephony-android.c @@ -30,15 +30,17 @@ extern jobject RockboxService_instance; void telephony_init_device(void) { JNIEnv e = *env_ptr; - jclass class = e->FindClass(env_ptr, "org/rockbox/RockboxTelephony"); - jmethodID constructor = e->GetMethodID(env_ptr, class, "", "(Landroid/content/Context;)V"); - - e->NewObject(env_ptr, class, constructor, RockboxService_instance); + jclass class = e->FindClass(env_ptr, "org/rockbox/monitors/TelephonyMonitor"); + jmethodID constructor = e->GetMethodID(env_ptr, class, + "", + "(Landroid/content/Context;)V"); + e->NewObject(env_ptr, class, + constructor, + RockboxService_instance); } - JNIEXPORT void JNICALL -Java_org_rockbox_RockboxTelephony_postCallIncoming(JNIEnv *env, jobject this) +Java_org_rockbox_monitors_TelephonyMonitor_postCallIncoming(JNIEnv *env, jobject this) { (void)env; (void)this; @@ -46,7 +48,7 @@ Java_org_rockbox_RockboxTelephony_postCallIncoming(JNIEnv *env, jobject this) } JNIEXPORT void JNICALL -Java_org_rockbox_RockboxTelephony_postCallHungUp(JNIEnv *env, jobject this) +Java_org_rockbox_monitors_TelephonyMonitor_postCallHungUp(JNIEnv *env, jobject this) { (void)env; (void)this; -- cgit v1.2.3