rildiff

--- /home/t0mm13b/AOSP/IceCreamSandwich/src/hardware/ril/libril/ril.cpp	2011-11-16 12:47:02.000000000 +0000
+++ ril.cpp	2011-12-03 02:56:06.199270205 +0000
@@ -3016,6 +3016,17 @@
     return p_info;
 }

+static void
+internalRemoveTimedCallback(void *callbackInfo)
+{
+    UserCallbackInfo *p_info;
+    p_info = (UserCallbackInfo *)callbackInfo;
+    LOGI("remove timer callback event");
+    if(p_info) {
+        if (ril_timer_delete(&(p_info->event)))
+			free(p_info);
+    }
+}

 extern "C" void
 RIL_requestTimedCallback (RIL_TimedCallback callback, void *param,
@@ -3023,6 +3034,13 @@
     internalRequestTimedCallback (callback, param, relativeTime);
 }

+
+extern "C" void
+RIL_removeTimedCallback (void *callbackInfo) {
+    internalRemoveTimedCallback(callbackInfo);
+}
+
+
 const char *
 failCauseToString(RIL_Errno e) {
     switch(e) {
--- /home/t0mm13b/AOSP/IceCreamSandwich/src/hardware/ril/libril/ril_event.cpp	2011-11-16 12:47:02.000000000 +0000
+++ ril_event.cpp	2011-12-03 02:56:06.225935879 +0000
@@ -122,15 +122,18 @@
     dump_event(ev);
 }

-static void removeFromList(struct ril_event * ev)
+static bool removeFromList(struct ril_event * ev)
 {
     dlog("~~~~ Removing event ~~~~");
+	/* Make sure the event actually exists */
+	if (!(ev->prev && ev->next))
+		return false;
     dump_event(ev);
-
     ev->next->prev = ev->prev;
     ev->prev->next = ev->next;
     ev->next = NULL;
     ev->prev = NULL;
+	return true;
 }


@@ -312,6 +315,17 @@
     dlog("~~~~ -ril_timer_add ~~~~");
 }

+// Remove event from timer list
+bool ril_timer_delete(struct ril_event *tev)
+{
+	bool ret = true;
+    dlog("~~~~timer event delete=%x",(unsigned int)tev);
+    MUTEX_ACQUIRE();
+    ret = removeFromList(tev);
+    MUTEX_RELEASE();
+	return ret;
+}
+
 // Remove event from watch or timer list
 void ril_event_del(struct ril_event * ev)
 {
--- /home/t0mm13b/AOSP/IceCreamSandwich/src/hardware/ril/libril/ril_event.h	2011-11-16 12:47:02.000000000 +0000
+++ ril_event.h	2011-12-03 02:56:11.159085586 +0000
@@ -47,6 +47,9 @@
 // Remove event from watch list
 void ril_event_del(struct ril_event * ev);

+// Remove event from timer list
+bool ril_timer_delete(struct ril_event * ev);
+
 // Event loop
 void ril_event_loop();