Merge lp:~alfonsosanchezbeato/powerd/ofono-fixes into lp:powerd

[Alfonso Sanchez-Beato]

* Add support for multiple ofono modems (LP#1295085)
* Handle simultaneous voice calls (LP#1191033)
* Listen to ofono USSD signals

* Add support for multiple ofono modems (LP#1295085)
* Handle simultaneous voice calls (LP#1191033)
* Listen to ofono USSD signals

[Tony Espy (awe)]

The overall changes look good to me.

That said, I've discussed with rsalveti and he said he'd claim the review, so I'll leave it to him to approve.

[Ricardo Salveti (rsalveti)]

254 + /* Activate proximity sensor if no previously existing call */
255 + if (g_calls == NULL)
256 + if (powerd_add_display_request(&prox_sensor_req, "prox-sensor"))
257 + powerd_warn("Request to use proximity sensor failed");

If you check the previous logic to enable/disable the proximity sensor, you'll see that it was only enabled when the call was in the active state, and not when the call was added in the ofono level. As a side effect, the proximity sensor is now enabled even before the call is active (the user accepts the call), which is a regression.

Please do a similar check, as we only want the proximity sensor to be enable when we have at least one active call in place.

review: Needs Fixing

[lp:~alfonsosanchezbeato/powerd/ofono-fixes]

115. By Alfonso Sanchez-Beato on 2014-03-26

Do not activate proximity sensor when calls are in "incoming" state

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

New commit takes state of the call into consideration for activating the proximity sensor. However, I have changed the logic a bit: previously, the sensor was activated when calls moved to either "alerting" or "active" states. Now I do it when the call reaches "dialing" or "active" state.

The rationale is as follows. Taking into account that the usual sequence of states of the calls is (not all transitions are considered):

Outgoing: dialing -> alerting -> active -> disconnected

Incoming: incoming -> active -> disconnected

then I think that it makes sense to activate the sensor when the state of an outgoing call is "dialing" instead of waiting for it to be "alerting", as most people once they press the call button they move their phone near to their ear immediately (while we are still dialing) so they can hear the other party ringing (move to alerting).

So the change makes sure the proximity sensor is off only when the state is "incoming": the user is supposed to be looking at the screen at that moment to decide whether to accept the call or not. We can discuss this further if you thing there is some problem with this.

[Ricardo Salveti (rsalveti)]

> New commit takes state of the call into consideration for activating the
> proximity sensor. However, I have changed the logic a bit: previously, the
> sensor was activated when calls moved to either "alerting" or "active" states.
> Now I do it when the call reaches "dialing" or "active" state.
>
> The rationale is as follows. Taking into account that the usual sequence of
> states of the calls is (not all transitions are considered):
>
> Outgoing: dialing -> alerting -> active -> disconnected
>
> Incoming: incoming -> active -> disconnected
>
> then I think that it makes sense to activate the sensor when the state of an
> outgoing call is "dialing" instead of waiting for it to be "alerting", as most
> people once they press the call button they move their phone near to their ear
> immediately (while we are still dialing) so they can hear the other party
> ringing (move to alerting).
>
> So the change makes sure the proximity sensor is off only when the state is
> "incoming": the user is supposed to be looking at the screen at that moment to
> decide whether to accept the call or not. We can discuss this further if you
> thing there is some problem with this.

Makes sense, and it now behaves similarly as done in android.

Just a minor comment:
235 +ofono_get_modems_cb(GObject *source_object,
236 + GAsyncResult *res,
237 + gpointer user_data)
238 +{
239 + GDBusProxy *client = G_DBUS_PROXY(source_object);

Indentation here is different from the rest of the file, please change it to be similar to the rest.

Building and testing.

review: Needs Fixing

[Ricardo Salveti (rsalveti)]

Tested and worked fine, can approve once the minor changes I asked in the previous comment are in place.

We already have a powerd landing slot in progress, once that lands, we can queue this MR.

[lp:~alfonsosanchezbeato/powerd/ofono-fixes]

116. By Alfonso Sanchez-Beato on 2014-03-27

Correct powerd.cpp indentations

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Indentations fixed. Just too used to ofono coding style...

How could I collapse the three commits of this MR, as can be done with "git rebase -i"?

[Ricardo Salveti (rsalveti)]

> Indentations fixed. Just too used to ofono coding style...

Thanks!

> How could I collapse the three commits of this MR, as can be done with "git
> rebase -i"?

Don't worry about that, they will not show by default when checking the logs from the main branch. I wouldn't worry about rebase with bzr, as that's kind of a pita to do. Git is indeed *way* easier when rebasing commits.

[Ricardo Salveti (rsalveti)]

review: Approve

[Ricardo Salveti (rsalveti)]

Actually, would you mind merging trunk back before I can land this MR?

[lp:~alfonsosanchezbeato/powerd/ofono-fixes]

117. By Alfonso Sanchez-Beato on 2014-03-28

Merge from main branch

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Trunk merged back.

=== modified file 'src/display.c'
--- src/display.c	2014-01-14 03:14:22 +0000
+++ src/display.c	2014-03-28 08:00:57 +0000
@@ -153,7 +153,7 @@
     current_state = state;
 }
 
-gboolean display_set_power_mode(int display, char *power_mode)
+gboolean display_set_power_mode(int display, const char *power_mode)
 {
     GError *error = NULL;
     GDBusProxy *unity_proxy = NULL;
 
=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2014-01-14 03:14:22 +0000
+++ src/powerd-internal.h	2014-03-28 08:00:57 +0000
@@ -51,6 +51,12 @@
     uint ref_count;
 };
 
+/* Used to track call state */
+struct call_data {
+    char *obj_name;
+    GDBusProxy *ofono_proxy;
+};
+
 void powerd_shutdown(void);
 void powerd_exit(int exit_code);
 void powerd_hal_signal_activity(void);
@@ -80,7 +86,7 @@
 /* Display functions */
 void powerd_brightness_set_value(gint value);
 gboolean powerd_display_enabled(void);
-gboolean display_set_power_mode(int display, char *powerd_mode);
+gboolean display_set_power_mode(int display, const char *powerd_mode);
 void powerd_set_display_state(struct powerd_display_request *req);
 int powerd_display_init(void);
 void powerd_proximity_event(gboolean near);
@@ -153,16 +159,28 @@
                          gpointer user_data);
 void powerd_name_vanished_cb(GDBusConnection *connection, const gchar *name,
                              gpointer user_data);
+void ofono_get_modems_cb(GObject *source_object, GAsyncResult *res,
+                         gpointer user_data);
+void ofono_voicecall_get_props_cb(GObject *source_object, GAsyncResult *res,
+                         gpointer user_data);
 
 /* dbus signal handlers */
+void on_ofono_manager_signal(GDBusProxy *proxy, gchar *sender_name,
+    gchar *signal_name, GVariant *parameters, gpointer user_data);
+void on_ofono_voicecall_signal(GDBusProxy *proxy, gchar *sender_name,
+    gchar *signal_name, GVariant *parameters, gpointer user_data);
 void on_ofono_voicecallmanager_signal(GDBusProxy *proxy, gchar *sender_name,
     gchar *signal_name, GVariant *parameters, gpointer user_data);
 void on_ofono_messagemanager_signal(GDBusProxy *proxy, gchar *sender_name,
     gchar *signal_name, GVariant *parameters, gpointer user_data);
-void on_ofono_voicecall_signal(GDBusProxy *proxy, gchar *sender_name,
+void on_ofono_ussd_signal(GDBusProxy *proxy, gchar *sender_name,
     gchar *signal_name, GVariant *parameters, gpointer user_data);
 
 /* dbus proxy async setup */
+void ofono_manager_proxy_connect_cb(GObject *source_object, GAsyncResult *res,
+    gpointer user_data);
+void ofono_voicecall_proxy_connect_cb(GObject *source_object, GAsyncResult *res,
+    gpointer user_data);
 void ofono_proxy_connect_cb(GObject *source_object, GAsyncResult *res,
     gpointer user_data);
 
 
=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2013-09-12 14:23:02 +0000
+++ src/powerd-object.c	2014-03-28 08:00:57 +0000
@@ -259,6 +259,60 @@
 }
 
 void
+ofono_manager_proxy_connect_cb(GObject *source_object,
+               GAsyncResult *res,
+               gpointer user_data)
+{
+    GError *error = NULL;
+    GDBusProxy *ofono_proxy;
+
+    ofono_proxy = g_dbus_proxy_new_finish(res, &error);
+    if (error) {
+        powerd_warn("%s failed: %s", __func__, error->message);
+        g_error_free(error);
+        return;
+    }
+
+    /* Register for insertion and removal of modems */
+    g_signal_connect(ofono_proxy, "g-signal",
+                        G_CALLBACK(on_ofono_manager_signal), NULL);
+
+    /* Get current modems */
+    g_dbus_proxy_call(ofono_proxy, "GetModems", NULL,
+                        G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                        ofono_get_modems_cb, NULL);
+}
+
+void
+ofono_voicecall_proxy_connect_cb(GObject *source_object,
+               GAsyncResult *res,
+               gpointer user_data)
+{
+    GError *error = NULL;
+    GDBusProxy *ofono_proxy;
+    struct call_data *call;
+
+    ofono_proxy = g_dbus_proxy_new_finish(res, &error);
+    if (error) {
+        powerd_warn("%s failed: %s", __func__, error->message);
+        g_error_free(error);
+        return;
+    }
+
+    call = user_data;
+    call->ofono_proxy = ofono_proxy;
+
+    /* Register for voicecall signals */
+    g_signal_connect(ofono_proxy, "g-signal",
+                        G_CALLBACK(on_ofono_voicecall_signal), NULL);
+
+    /* Get current voice call state */
+    g_dbus_proxy_call(ofono_proxy, "GetProperties", NULL,
+                        G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                        ofono_voicecall_get_props_cb, NULL);
+}
+
+void
 ofono_proxy_connect_cb(GObject *source_object,
                GAsyncResult *res,
                gpointer user_data)
@@ -275,18 +329,18 @@
     else {
         interface_name = g_dbus_proxy_get_interface_name(ofono_proxy);
         powerd_debug("ofono_proxy_connect_cb: proxy is %s", interface_name);
-        if (!strcmp(interface_name,"org.ofono.VoiceCall")) {
-            g_signal_connect(ofono_proxy, "g-signal",
-                G_CALLBACK (on_ofono_voicecall_signal), NULL);
-        }
-        else if (!strcmp(interface_name,"org.ofono.VoiceCallManager")) {
+        if (!strcmp(interface_name, "org.ofono.VoiceCallManager")) {
             g_signal_connect(ofono_proxy, "g-signal",
                 G_CALLBACK (on_ofono_voicecallmanager_signal), NULL);
         }
-        else if (!strcmp(interface_name,"org.ofono.MessageManager")) {
+        else if (!strcmp(interface_name, "org.ofono.MessageManager")) {
             g_signal_connect(ofono_proxy, "g-signal",
                 G_CALLBACK (on_ofono_messagemanager_signal), NULL);
         }
+        else if (!strcmp(interface_name, "org.ofono.SupplementaryServices")) {
+            g_signal_connect(ofono_proxy, "g-signal",
+                G_CALLBACK (on_ofono_ussd_signal), NULL);
+        }
         else {
             powerd_warn("unknown interface name for this proxy, ignoring");
         }
 
=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2014-03-27 21:00:43 +0000
+++ src/powerd.cpp	2014-03-28 08:00:57 +0000
@@ -125,6 +125,31 @@
     POWERD_DISPLAY_FLAG_BRIGHT       /* flags */
 };
 
+/* List with detected modems */
+static GSList *g_modems = NULL;
+
+static void free_call_data(void *data)
+{
+    struct call_data *call = (struct call_data *) data;
+    g_free(call->obj_name);
+    if (call->ofono_proxy)
+        g_object_unref(call->ofono_proxy);
+}
+
+static gint call_data_cmp(gconstpointer a, gconstpointer b)
+{
+    const struct call_data *call = (const struct call_data *) a;
+    const char *call_name = (const char *) b;
+
+    return strcmp(call->obj_name, call_name);
+}
+
+/* List with existing calls */
+static GSList *g_calls = NULL;
+
+/* Flag set when proximity sensor is on */
+static gboolean g_proximity_on = FALSE;
+
 gboolean activity_monitor(gpointer data);
 void update_screen_state(int state);
 
@@ -294,6 +319,184 @@
     powerd_reset_activity_timer(1);
 }
 
+static void watch_modem(const char *modem)
+{
+    /* for incoming SMS signals */
+    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
+        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+        NULL,
+        "org.ofono",
+        modem,
+        "org.ofono.MessageManager",
+        NULL,
+        (GAsyncReadyCallback)ofono_proxy_connect_cb,
+        NULL);
+
+    /* for incoming calls Added/Removed signals */
+    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
+        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+        NULL,
+        "org.ofono",
+        modem,
+        "org.ofono.VoiceCallManager",
+        NULL,
+        (GAsyncReadyCallback)ofono_proxy_connect_cb,
+        NULL);
+
+    /* for USSD notifications/network requests */
+    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
+        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+        NULL,
+        "org.ofono",
+        modem,
+        "org.ofono.SupplementaryServices",
+        NULL,
+        (GAsyncReadyCallback)ofono_proxy_connect_cb,
+        NULL);
+}
+
+void
+ofono_get_modems_cb(GObject *source_object,
+                    GAsyncResult *res,
+                    gpointer user_data)
+{
+    GDBusProxy *client = G_DBUS_PROXY(source_object);
+    GVariant *result;
+    GVariant *item;
+    GError *error = NULL;
+    GVariantIter *iter;
+
+    result = g_dbus_proxy_call_finish(client, res, &error);
+    if (result == NULL) {
+        powerd_warn("%s: call error", __func__);
+        return;
+    }
+
+    g_variant_get(result, "(a(oa{sv}))", &iter);
+    while ((item = g_variant_iter_next_value(iter))) {
+        const char *obj_path;
+
+        g_variant_get_child(item, 0, "&o", &obj_path);
+
+        if (g_slist_find_custom(g_modems, obj_path, (GCompareFunc) strcmp)
+                == NULL) {
+            powerd_debug("active ofono modem %s", obj_path);
+            g_modems = g_slist_prepend(g_modems, g_strdup(obj_path));
+            watch_modem(obj_path);
+        }
+
+        g_variant_unref(item);
+    }
+
+    g_variant_unref(result);
+}
+
+static void notify_proximity_sensor(const char *call_state)
+{
+    /*
+     * This function enables the proximity sensor in case the new state of the
+     * call is:
+     *
+     * Active - meaning, the call is in progress --> Proximity On
+     * Dialing - a signal made on outbound calls only which means that
+     *           we have started to talk to the network, but the call has not
+     *           been picked up. --> Proximity On (this signal is not
+     *           sent on inbound calls)
+     * Note that the proximity sensor is not activated for "incoming" state
+     * For more details on states see voicecall-api.txt in the ofono source
+     */
+
+    if (g_proximity_on)
+        return;
+
+    if (strcmp("active", call_state) == 0
+            || strcmp("dialing", call_state) == 0) {
+        if (powerd_add_display_request(&prox_sensor_req, "prox-sensor"))
+                powerd_warn("Request to use proximity sensor failed");
+        g_proximity_on = TRUE;
+    }
+}
+
+static void deactivate_proximity_sensor(void)
+{
+    if (!g_proximity_on)
+        return;
+
+    powerd_remove_display_request(prox_sensor_req.cookie);
+    g_proximity_on = FALSE;
+}
+
+void
+ofono_voicecall_get_props_cb(GObject *source_object, GAsyncResult *res,
+                             gpointer user_data)
+{
+    GDBusProxy *client = G_DBUS_PROXY(source_object);
+    GVariant *result;
+    GVariant *item;
+    GError *error = NULL;
+    GVariantIter *iter = NULL;
+
+    result = g_dbus_proxy_call_finish(client, res, &error);
+    if (result == NULL) {
+        powerd_warn("%s: call error", __func__);
+        return;
+    }
+
+    g_variant_get(result, "(a{sv})", &iter);
+
+    while ((item = g_variant_iter_next_value(iter))) {
+        GVariant *value = NULL;
+        const char *prop_name = NULL;
+        const char *call_state = NULL;
+
+        g_variant_get(item, "{&sv}", &prop_name, &value);
+
+        if (strcmp("State", prop_name) == 0) {
+            g_variant_get(value, "&s", &call_state);
+            notify_proximity_sensor(call_state);
+            powerd_info("GetProperties. Call State = %s", call_state);
+        }
+
+        g_variant_unref(value);
+        g_variant_unref(item);
+    }
+
+    g_variant_unref(result);
+}
+
+void on_ofono_manager_signal(GDBusProxy *proxy, gchar *sender_name,
+    gchar *signal_name, GVariant *parameters, gpointer user_data)
+{
+    const gchar *object_path;
+    GVariant *tmp;
+    char *modem;
+    GSList *node;
+
+    tmp = g_variant_get_child_value(parameters, 0);
+
+    object_path = g_variant_get_string(tmp, NULL);
+    node = g_slist_find_custom(g_modems, object_path, (GCompareFunc) strcmp);
+
+    if (strcmp("ModemAdded", signal_name) == 0) {
+        /* Add if not already in list */
+        if (node == NULL) {
+            powerd_debug("watching ofono modem %s", object_path);
+            modem = g_strdup(object_path);
+            g_modems = g_slist_prepend(g_modems, modem);
+            watch_modem(modem);
+        }
+    } else if(strcmp("ModemRemoved", signal_name) == 0) {
+        /* Remove if found in list */
+        if (node != NULL) {
+            powerd_debug("stop watch on ofono modem %s", object_path);
+            g_free(g_modems->data);
+            g_modems = g_slist_delete_link(g_modems, node);
+        }
+    }
+
+    g_variant_unref(tmp);
+}
+
 void
 on_ofono_voicecallmanager_signal (GDBusProxy *proxy,
            gchar      *sender_name,
@@ -301,12 +504,76 @@
            GVariant   *parameters,
            gpointer    user_data)
 {
-    powerd_debug("we get signal from %s: %s", sender_name, signal_name);
-    /* from org.ofono.VoiceCallManager - a call was added */
+    GVariant *tmp;
+
     if (!strcmp(signal_name, "CallAdded")) {
-        powerd_debug("Waking up the device - Incoming Call");
+        struct call_data *call;
+
         powerd_display_clear_override(POWERD_OVERRIDE_REASON_POWER_BUTTON);
         powerd_reset_activity_timer(1);
+
+        call = (struct call_data *) calloc(1, sizeof(*call));
+        tmp = g_variant_get_child_value(parameters, 0);
+        call->obj_name = g_variant_dup_string(tmp, NULL);
+        g_calls = g_slist_prepend(g_calls, call);
+
+        powerd_info("%s incoming call", call->obj_name);
+
+        /* Connect to voicecall interface */
+        g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
+            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+            NULL,
+            "org.ofono",
+            call->obj_name,
+            "org.ofono.VoiceCall",
+            NULL,
+            (GAsyncReadyCallback) ofono_voicecall_proxy_connect_cb,
+            call);
+
+        g_variant_unref(tmp);
+
+    } else if (!strcmp(signal_name, "CallRemoved")) {
+        const gchar *object_path;
+        GSList *node;
+
+        tmp = g_variant_get_child_value(parameters, 0);
+        object_path = g_variant_get_string(tmp, NULL);
+        node = g_slist_find_custom(g_calls, object_path, call_data_cmp);
+        if (node != NULL) {
+            free_call_data(node->data);
+            g_calls = g_slist_delete_link(g_calls, node);
+            powerd_info("%s call removed", object_path);
+        }
+
+        if (g_calls == NULL)
+            deactivate_proximity_sensor();
+
+        g_variant_unref(tmp);
+    }
+}
+
+void
+on_ofono_voicecall_signal (GDBusProxy *proxy,
+           gchar      *sender_name,
+           gchar      *signal_name,
+           GVariant   *parameters,
+           gpointer    user_data)
+{
+    GVariant *value = NULL;
+    const char *prop_name = NULL;
+    const char *call_state = NULL;
+
+    if (!strcmp(signal_name, "PropertyChanged")) {
+        g_variant_get(parameters, "(&sv)", &prop_name, &value);
+
+        if (!strcmp(prop_name, "State")) {
+            g_variant_get(value, "&s", &call_state);
+
+            powerd_info("Call State = %s", call_state);
+            notify_proximity_sensor(call_state);
+        }
+
+        g_variant_unref(value);
     }
 }
 
@@ -327,63 +594,19 @@
     }
 }
 
-void
-on_ofono_voicecall_signal (GDBusProxy *proxy,
+void on_ofono_ussd_signal(GDBusProxy *proxy,
            gchar      *sender_name,
            gchar      *signal_name,
            GVariant   *parameters,
            gpointer    user_data)
 {
-    GVariant *value = NULL;
-    const char *prop_name;
-    const char *prop_value;
-    static gboolean alerted = FALSE;
-
     powerd_debug("we get signal from %s: %s", sender_name, signal_name);
-
-    /* This function enables and disables the proximity sensor based
-     * on the state of the call.
-     *
-     * Active - meaning, the call is in progress --> Proximity On
-     * Alerting - a signal made on outbound calls only which means that
-     *            the phone is ringing on the other side, but has not
-     *            been picked up. --> Proximity On (this signal is not
-     *            sent on inbound calls)
-     * Disconnected - the call is over. --> Proximity Off.
-     *
-     * For more details on states see voicecall-api.txt in the ofono source
-     */
-
-    /* Note: As of June 13, 2013, the phone cannot successfully
-     * accept a call while another call is in progress. When this is fixed
-     * the code below will need to be rewritten to handle multiple
-     * active/disconnected signals. LP: #1191033 (mfisch) */
-
-    if (!strcmp(signal_name, "PropertyChanged")) {
-        g_variant_get(parameters, "(&sv)", &prop_name, &value);
-        if (!strcmp(prop_name,"State")) {
-            g_variant_get(value, "&s", &prop_value);
-            powerd_debug("Call State = %s", prop_value);
-            if (!strcmp(prop_value,"active")) {
-                if (!alerted) {
-                    //call is active, enable sensor
-                    if (powerd_add_display_request(&prox_sensor_req, "prox-sensor"))
-                        powerd_warn("Request to use proximity sensor failed");
-                }
-            }
-            if (!strcmp(prop_value,"alerting")) {
-                alerted = TRUE;
-                //call is altering, enable sensor
-                if (powerd_add_display_request(&prox_sensor_req, "prox-sensor"))
-                    powerd_warn("Request to use proximity sensor failed");
-            }
-            else if (!strcmp(prop_value,"disconnected")) {
-                alerted = FALSE;
-                //call is disconnected, disable sensor
-                powerd_remove_display_request(prox_sensor_req.cookie);
-            }
-            g_variant_unref(value);
-        }
+    /* from org.ofono.MessageManager */
+    if ((!strcmp(signal_name, "NotificationReceived")) ||
+        (!strcmp(signal_name, "RequestReceived"))) {
+        powerd_debug("Waking up the device - Incoming USSD");
+        powerd_display_clear_override(POWERD_OVERRIDE_REASON_POWER_BUTTON);
+        powerd_reset_activity_timer(1);
     }
 }
 
@@ -445,37 +668,15 @@
         powerd_name_acquired_cb, powerd_name_lost_cb, NULL, NULL);
     powerd_debug("owner id: %u", name_id);
 
-    /* for incoming SMS signals */
-    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
-        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-        NULL,
-        "org.ofono",
-        "/ril_0",
-        "org.ofono.MessageManager",
-        NULL,
-        (GAsyncReadyCallback)ofono_proxy_connect_cb,
-        NULL);
-
-    /* for incoming calls Added/Removed signals */
-    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
-        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-        NULL,
-        "org.ofono",
-        "/ril_0",
-        "org.ofono.VoiceCallManager",
-        NULL,
-        (GAsyncReadyCallback)ofono_proxy_connect_cb,
-        NULL);
-
-    /* for answering a call/hanging up signals */
-    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
-        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-        NULL,
-        "org.ofono",
-        "/ril_0/voicecall01",
-        "org.ofono.VoiceCall",
-        NULL,
-        (GAsyncReadyCallback)ofono_proxy_connect_cb,
+    /* Listen to modem creation */
+    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
+        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+        NULL,
+        "org.ofono",
+        "/",
+        "org.ofono.Manager",
+        NULL,
+        (GAsyncReadyCallback) ofono_manager_proxy_connect_cb,
         NULL);
 
     /* Init this first, data is used by other inits */
@@ -547,5 +748,8 @@
     power_request_deinit();
     powerd_client_deinit();
     powerd_stats_deinit();
+    g_slist_free_full(g_modems, g_free);
+    g_slist_free_full(g_calls, free_call_data);
+
     return g_exit_code;
 }