3 files changed, 70 insertions, 24 deletions

diff --git a/firmware/target/hosted/android/kernel-android.c b/firmware/target/hosted/android/kernel-android.c
index 636c849c24..c0d927d026 100644
--- a/firmware/target/hosted/android/kernel-android.c
+++ b/firmware/target/hosted/android/kernel-android.c
@@ -52,22 +52,6 @@ Java_org_rockbox_RockboxTimer_timerTask(JNIEnv *env, jobject this)
     call_tick_tasks();
 }
 
-JNIEXPORT void JNICALL
-Java_org_rockbox_RockboxTimer_postCallIncoming(JNIEnv *env, jobject this)
-{
-    (void)env;
-    (void)this;
-    queue_broadcast(SYS_CALL_INCOMING, 0);
-}
-
-JNIEXPORT void JNICALL
-Java_org_rockbox_RockboxTimer_postCallHungUp(JNIEnv *env, jobject this)
-{
-    (void)env;
-    (void)this;
-    queue_broadcast(SYS_CALL_HUNG_UP, 0);
-}
-
 void tick_start(unsigned int interval_in_ms)
 {
     JNIEnv e = *env_ptr;
@@ -76,7 +60,7 @@ void tick_start(unsigned int interval_in_ms)
     jmethodID constructor = e->GetMethodID(env_ptr,
                                            RockboxTimer_class,
                                            "<init>",
-                                           "(Lorg/rockbox/RockboxService;J)V");
+                                           "(Landroid/content/Context;J)V");
     /* the constructor will do the tick_start */
     RockboxTimer_instance = e->NewObject(env_ptr,
                                          RockboxTimer_class,
diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c
index 7d1fe9d458..009630eeaa 100644
--- a/firmware/target/hosted/android/system-android.c
+++ b/firmware/target/hosted/android/system-android.c
@@ -24,10 +24,6 @@
 #include "config.h"
 #include "system.h"
 
-void system_exception_wait(void) { }
-void system_reboot(void) { }
-void power_off(void) { }
-void system_init(void) { }
 
 
 /* global fields for use with various JNI calls */
@@ -40,6 +36,21 @@ uintptr_t *stackend;
 
 extern int main(void);
 extern void powermgmt_init_target(void);
+extern void telephony_init_device(void);
+
+void system_exception_wait(void) { }
+void system_reboot(void) { }
+void power_off(void) { }
+
+void system_init(void)
+{
+    /* no better place yet, most of powermgmt.c is #ifdef'd out for non-native
+     * builds */
+    powermgmt_init_target();
+    /* also no better place yet */
+    telephony_init_device();
+}
+
 /* this is the entry point of the android app initially called by jni */
 JNIEXPORT void JNICALL
 Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
@@ -57,8 +68,5 @@ Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
     RockboxService_instance = this;
     RockboxService_class = (*env)->GetObjectClass(env, this);
 
-    /* no better place yet, most of powermgmt.c is #ifdef'd out for non-native
-     * builds */
-    powermgmt_init_target();
     main();
 }
diff --git a/firmware/target/hosted/android/telephony-android.c b/firmware/target/hosted/android/telephony-android.c
new file mode 100644
index 0000000000..771b7a973a
--- /dev/null
+++ b/firmware/target/hosted/android/telephony-android.c
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 by Thomas Martitz
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+
+#include <jni.h>
+#include "kernel.h"
+
+extern JNIEnv *env_ptr;
+extern 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, "<init>", "(Landroid/content/Context;)V");
+
+    e->NewObject(env_ptr, class, constructor, RockboxService_instance);
+}
+
+
+JNIEXPORT void JNICALL
+Java_org_rockbox_RockboxTelephony_postCallIncoming(JNIEnv *env, jobject this)
+{
+    (void)env;
+    (void)this;
+    queue_broadcast(SYS_CALL_INCOMING, 0);
+}
+
+JNIEXPORT void JNICALL
+Java_org_rockbox_RockboxTelephony_postCallHungUp(JNIEnv *env, jobject this)
+{
+    (void)env;
+    (void)this;
+    queue_broadcast(SYS_CALL_HUNG_UP, 0);
+}