Merge lp:~phablet-team/network-manager/lp1445080-wily into lp:~network-manager/network-manager/ubuntu

[Tony Espy]

This change re-factors the modem_state handling code in NMModemOfono to solve underlying race conditions in the handling of flight-mode.

[Mathieu Trudel-Lapierre (cyphermox)]

Have the code bits been discussed with upstream? What is the likely impact on non-ofono modems of the changes to nm_device_modem to not return that connections are unavailable when the modem is still in NM_MODEM_STATE_INITIALIZING state, for example?

As per the other patches, I think the ofono code changes should be merged in to the main patch for the modem support (since we're at a development release, this makes it just one large patch to fixup when there is a need to refresh the patch, rather than conflicting, interdepending change sets), and any core changes should be in a separate, isolated patch so that we can send them upstream ASAP.

Since I don't know whether there has been careful testing of the impact of the NMDeviceModem changes on non-ofono modem -> Needs Information.

review: Needs Information

[lp:~phablet-team/network-manager/lp1445080-wily]

967. By Tony Espy on 2015-07-15

debian/patches/add_ofono_settings_support.patch: remove code
that added APN, USERNAME and PASSWORD to NM_SETTING_GSM object.
NM doesn't actually need access to these settings, and USERNAME/
PASSWORD can cause issues with NM's secrets needed logic.

968. By Tony Espy on 2015-07-15

debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch,
debian/patches/lp1461593-add-nm-settings-connection-reset-retries-methods.patch,
debian/patches/add_ofono_settings_support.patch,
debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch: More changes
to NMModemOfono's modem_state handling. Added get/set_reset_retries_timeout
methods to NMSettingsConnection, and use the set method to lower the timeout for
ofono connections to 30s. Finally added a 5s delay to NM_POLICY's activation
logic triggered when a modem device is disconnected. This allows modem time to
settle and NM to process the resulting DBus state changes. (LP: #1461593)

969. By Tony Espy on 2015-07-17

Updated new patches for DEP-3, and re-ordered ofono patches.

970. By Tony Espy on 2015-07-17

debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch,
debian/patches/lp1445080-modify-device-modem-avail.patch,
debian/patches/lp1445080-nm-modem-check-for-set-mm-enabled-func.patch,
debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch: These
changes collectively fix flight-mode on arale ( and other devices ), due to
some fundemental race conditions in the ofono logic. (LP: #1445080, #1440917)

[Tony Espy (awe)]

Updated to fold the core changes into existing patches, created new patches for core changes, and ensure that new patches have DEP-3 headers.

Yes, some of the core changes were discussed upstream, but as I wasn't getting much traction with upstream and the changes needed to land for phone networking stabilization, the changes were landed in the phone overlay PPA after being reviewed and thoroughly tested.

> What is the likely impact on non-ofono modems of the changes to nm_device_modem to not return that connections are unavailable when the modem is still in NM_MODEM_STATE_INITIALIZING state, for example?

Actually, that's not how the change works. The change ensures that devices with a modem_state <= SEARCHING are considered unavailable. As INITIALIZING is less than SEARCHING, modems in this state will still be considered unavailable. This is consistent with the function documentation for nm_device_is_available () and nm_device_connection_is_available (). Note, this hasn't been tested on non-ofono modems, so this will need to be done. If problems arise, then we will need to add a hook so that NMModemOfono can implement a stricter policy than NMDeviceModem for availability.

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-17 20:04:13 +0000
+++ debian/changelog	2015-07-17 20:04:14 +0000
@@ -15,6 +15,13 @@
     logic triggered when a modem device is disconnected.  This allows modem time to
     settle and NM to process the resulting DBus state changes. (LP: #1461593)
 
+  * debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch,
+    debian/patches/lp1445080-modify-device-modem-avail.patch,
+    debian/patches/lp1445080-nm-modem-check-for-set-mm-enabled-func.patch,
+    debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch: These
+    changes collectively fix flight-mode on arale ( and other devices ), due to
+    some fundemental race conditions in the ofono logic. (LP: #1445080, #1440917)
+
  -- Tony Espy <[e-mail]>  Wed, 15 Jul 2015 15:35:17 -0400
 
 network-manager (0.9.10.0-4ubuntu18) wily; urgency=medium

=== modified file 'debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch'
--- debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch	2015-07-17 20:04:13 +0000
+++ debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch	2015-07-17 20:04:14 +0000
@@ -304,7 +304,7 @@
 ===================================================================
 --- /dev/null
 +++ network-manager-0.9.10.0/src/devices/wwan/nm-modem-ofono.c
-@@ -0,0 +1,1147 @@
+@@ -0,0 +1,1179 @@
 +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 +/* NetworkManager -- Network link manager
 + *
@@ -361,14 +361,13 @@
 +
 +	char **interfaces;
 +	char *context_path;
++	char *imsi;
 +
 +	gboolean modem_online;
 +	gboolean gprs_attached;
-+	gboolean gprs_powered;
 +
 +	NMIP4Config *ip4_config;
 +
-+	gboolean enabled;
 +} NMModemOfonoPrivate;
 +
 +#define NM_OFONO_ERROR (nm_ofono_error_quark ())
@@ -396,6 +395,43 @@
 +	return TRUE;
 +}
 +
++static void ofono_read_contexts (NMModemOfono *self);
++
++static void
++update_modem_state (NMModemOfono *self)
++{
++	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
++	NMModemState state = nm_modem_get_state (NM_MODEM (self));
++	NMModemState new_state = NM_MODEM_STATE_UNKNOWN;
++	const char *reason;
++
++	nm_log_info (LOGD_MB, "(%s): %s: 'Attached': %s 'Online': %s 'IMSI': %s",
++	             nm_modem_get_path (NM_MODEM (self)),
++	             __func__,
++	             priv->gprs_attached ? "true" : "false",
++	             priv->modem_online ? "true" : "false",
++	             priv->imsi);
++
++	if (priv->modem_online == FALSE) {
++		new_state = NM_MODEM_STATE_DISABLED;
++		reason = "modem 'Online=false'";
++	} else if (priv->imsi == NULL && state != NM_MODEM_STATE_ENABLING) {
++		new_state = NM_MODEM_STATE_DISABLED;
++		reason = "modem not ready";
++	} else if (priv->gprs_attached == FALSE) {
++		if (state >= NM_MODEM_STATE_ENABLING) {
++			new_state = NM_MODEM_STATE_SEARCHING;
++			reason = "modem searching";
++		}
++	} else {
++		new_state = NM_MODEM_STATE_REGISTERED;
++		reason = "modem ready";
++	}
++
++	if (state != new_state)
++		nm_modem_set_state (NM_MODEM (self), new_state, reason);
++}
++
 +/* Disconnect stuff */
 +typedef struct {
 +	NMModemOfono *self;
@@ -415,7 +451,6 @@
 +	SimpleDisconnectContext *ctx = (SimpleDisconnectContext*) user_data;
 +	NMModemOfono *self = ctx->self;
 +	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	NMModemState state;
 +	GError *error = NULL;
 +
 +	nm_log_dbg (LOGD_MB, "in %s", __func__);
@@ -430,15 +465,7 @@
 +
 +	simple_disconnect_context_free (ctx);
 +
-+	/* No need to re-read contexts in this case... */
-+
-+	if (priv->modem_online && priv->gprs_powered && priv->gprs_attached)
-+		state = NM_MODEM_STATE_REGISTERED;
-+	else
-+		state = NM_MODEM_STATE_SEARCHING;
-+
-+	nm_modem_set_state (NM_MODEM (self), state,
-+	                    nm_modem_state_to_string (state));
++	update_modem_state (self);
 +}
 +
 +static void
@@ -448,16 +475,20 @@
 +	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
 +	SimpleDisconnectContext *ctx;
 +	GValue value = G_VALUE_INIT;
++	NMModemState state = nm_modem_get_state (NM_MODEM (self));
 +
 +	nm_log_dbg (LOGD_MB, "in %s", __func__);
 +
++	if (state != NM_MODEM_STATE_CONNECTED)
++		return;
++
 +	ctx = g_slice_new (SimpleDisconnectContext);
 +	ctx->self = g_object_ref (self);
 +	ctx->warn = warn;
 +
 +	nm_modem_set_state (NM_MODEM (self),
-+						NM_MODEM_STATE_DISCONNECTING,
-+						nm_modem_state_to_string (NM_MODEM_STATE_DISCONNECTING));
++	                    NM_MODEM_STATE_DISCONNECTING,
++	                    nm_modem_state_to_string (NM_MODEM_STATE_DISCONNECTING));
 +
 +	g_value_init (&value, G_TYPE_BOOLEAN);
 +	g_value_set_boolean (&value, FALSE);
@@ -468,7 +499,6 @@
 +	                                      G_TYPE_STRING, "Active",
 +	                                      G_TYPE_VALUE, &value,
 +	                                      G_TYPE_INVALID);
-+
 +}
 +
 +static void
@@ -494,37 +524,25 @@
 +
 +	return proxy;
 +}
-+
-+static void ofono_read_contexts (NMModemOfono *self);
-+
 +static void
-+update_ofono_enabled (NMModemOfono *self,
-+                      gboolean new_enabled)
++handle_attached (NMModemOfono *self, GValue *value)
 +{
 +	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	NMModemState new_state;
-+
-+	if (new_enabled == priv->enabled)
-+		return;
-+
-+	if (new_enabled) {
-+		new_state = NM_MODEM_STATE_REGISTERED;
-+		ofono_read_contexts (self);
-+	} else {
-+		new_state = NM_MODEM_STATE_SEARCHING;
++	gboolean attached = g_value_get_boolean (value);
++
++	if (priv->gprs_attached != attached) {
++		priv->gprs_attached = attached;
++
++		nm_log_info (LOGD_MB, "(%s): %s: new value for 'Attached': %s",
++		             nm_modem_get_path (NM_MODEM (self)),
++		             __func__,
++		             attached ? "true" : "false");
++
++		update_modem_state (self);
 +	}
-+
-+	nm_modem_set_state (NM_MODEM (self),
-+	                    new_state,
-+	                    nm_modem_state_to_string (new_state));
-+
-+	priv->enabled = new_enabled;
-+
-+	nm_log_info (LOGD_MB, "(%s) now in state: %s",
-+	             nm_modem_get_path (NM_MODEM (self)),
-+	             nm_modem_state_to_string(new_state));
 +}
 +
++
 +static void
 +get_ofono_conn_manager_properties_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
 +{
@@ -537,8 +555,8 @@
 +	nm_log_dbg (LOGD_MB, "in %s", __func__);
 +
 +	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
-+	                            DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
-+	                            G_TYPE_INVALID)) {
++		                        DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
++		                        G_TYPE_INVALID)) {
 +		nm_log_warn (LOGD_MB, "failed get connection manager properties: (%d) %s",
 +		             error ? error->code : -1,
 +		             error && error->message ? error->message : "(unknown)");
@@ -546,34 +564,13 @@
 +	}
 +
 +	value = g_hash_table_lookup (properties, "Attached");
-+	if (value)
-+		priv->gprs_attached = g_value_get_boolean (value);
-+	else
-+		nm_log_warn (LOGD_MB, "failed get GPRS state: unexpected reply type");
-+	g_value_unset (value);
-+
-+	value = g_hash_table_lookup (properties, "Powered");
-+	if (value)
-+		priv->gprs_powered = g_value_get_boolean (value);
-+	else
-+		nm_log_warn (LOGD_MB, "failed get modem enabled state: unexpected reply type");
-+	g_value_unset (value);
-+
-+	update_ofono_enabled (self, priv->modem_online
-+	                            && priv->gprs_powered
-+	                            && priv->gprs_attached);
-+}
-+
-+static void
-+get_ofono_conn_manager_properties (NMModemOfono *self)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+
-+	dbus_g_proxy_begin_call_with_timeout (priv->connman_proxy,
-+	                                      "GetProperties",
-+	                                      get_ofono_conn_manager_properties_done,
-+	                                      self, NULL, 20000,
-+	                                      G_TYPE_INVALID);
++	if (value) {
++		handle_attached (self, value);
++		g_value_unset (value);
++	} else
++		nm_log_warn (LOGD_MB, "(%s): %s: no 'Attached' property found",
++		             nm_modem_get_path (NM_MODEM (self)),
++		             __func__);
 +}
 +
 +static void
@@ -583,21 +580,81 @@
 +                               gpointer user_data)
 +{
 +	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (g_strcmp0 (key, "Powered") == 0 && G_VALUE_HOLDS_BOOLEAN (value)) {
-+		priv->gprs_powered = g_value_get_boolean (value);
-+	} else if (g_strcmp0 (key, "Attached") == 0 && G_VALUE_HOLDS_BOOLEAN (value)) {
-+		priv->gprs_attached = g_value_get_boolean (value);
-+	} else
-+		/* No need to update enabled for other property changes */
++
++	nm_log_dbg (LOGD_MB, "in %s", __func__);
++
++	if (g_strcmp0 (key, "Attached") == 0 && G_VALUE_HOLDS_BOOLEAN (value))
++		handle_attached (self, value);
++}
++
++static void
++handle_subscriber_identity(NMModemOfono *self, GValue *value)
++{
++	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
++	const gchar *value_str = g_value_get_string (value);
++
++	/* Check for empty DBus string value */
++	if (g_strcmp0 (value_str, "(null)") != 0) {
++
++		if (g_strcmp0 (value_str, priv->imsi) != 0) {
++
++			if (priv->imsi != NULL) {
++				nm_log_warn (LOGD_MB, "SimManager:'SubscriberIdentity' changed: %s", priv->imsi);
++				g_free(priv->imsi);
++			}
++
++			nm_log_info (LOGD_MB, "GetPropsDone: 'SubscriberIdentity': %s", priv->imsi);
++
++			priv->imsi = g_strdup (value_str);
++			ofono_read_contexts (self);
++			update_modem_state (self);
++		}
++	}
++}
++
++
++static void
++get_ofono_sim_properties_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
++{
++	NMModemOfono *self = NM_MODEM_OFONO (user_data);
++	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
++	NMModemState state = nm_modem_get_state (NM_MODEM (self));
++	GError *error = NULL;
++	GHashTable *properties = NULL;
++	GValue *value = NULL;
++	const gchar *value_str;
++
++	nm_log_dbg (LOGD_MB, "in %s", __func__);
++
++	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
++		                        DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
++		                        G_TYPE_INVALID)) {
++		nm_log_warn (LOGD_MB, "failed to get ofono SimManager properties: (%d) %s",
++		             error ? error->code : -1,
++		             error && error->message ? error->message : "(unknown)");
 +		return;
-+
-+	update_ofono_enabled (self, priv->modem_online
-+	                            && priv->gprs_powered
-+	                            && priv->gprs_attached);
++	}
++
++	value = g_hash_table_lookup (properties, "SubscriberIdentity");
++
++	if (value) {
++		handle_subscriber_identity (self, value);
++		g_value_unset (value);
++	} else {
++		nm_log_warn (LOGD_MB, "failed to get SimManager:'SubscriberIdentity'; not found");
++	}
++}
++
++static void
++ofono_sim_properties_changed (DBusGProxy *proxy,
++                              const char *key,
++                              GValue *value,
++                              gpointer user_data)
++{
++	NMModemOfono *self = NM_MODEM_OFONO (user_data);
++
++	if (g_strcmp0 (key, "SubscriberIdentity") == 0 && G_VALUE_HOLDS_STRING (value))
++		handle_subscriber_identity (self, value);
 +}
 +
 +static void
@@ -625,32 +682,15 @@
 +	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
 +	DBusGConnection *bus;
 +	DBusGProxy *settings_proxy;
-+	GHashTable *properties;
-+	GError *error = NULL;
-+	const char *imsi;
 +
 +	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+	nm_log_info (LOGD_MB, "(%s): trying to read IMSI contexts from oFono files",
-+	             nm_modem_get_path (NM_MODEM (self)));
++
++	if (priv->imsi == NULL) {
++		nm_log_warn (LOGD_MB, "No 'SubscriberIdentity', so can't read ofono GPRS contexts");
++		return;
++	}
 +
 +	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
-+
-+	dbus_g_proxy_call_with_timeout (priv->simmanager_proxy,
-+	                                "GetProperties",
-+	                                20000,
-+	                                &error,
-+	                                G_TYPE_INVALID,
-+	                                DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
-+	                                G_TYPE_INVALID);
-+
-+	if (error) {
-+		nm_log_warn (LOGD_MB, "Could not get SIM properties: %s",
-+		             error && error->message ? error->message : "(unknown)");
-+		g_clear_error (&error);
-+	}
-+
-+	imsi = g_value_get_string (g_hash_table_lookup (properties, "SubscriberIdentity"));
-+
 +	settings_proxy = dbus_g_proxy_new_for_name (bus,
 +	                                            "com.canonical.NMOfono",
 +	                                            "/com/canonical/NMOfono",
@@ -660,7 +700,7 @@
 +		dbus_g_proxy_begin_call_with_timeout (settings_proxy,
 +		                                      "ReadImsiContexts", ofono_read_imsi_contexts_done,
 +		                                      self, NULL, 20000,
-+		                                      G_TYPE_STRING, imsi,
++		                                      G_TYPE_STRING, priv->imsi,
 +		                                      G_TYPE_INVALID);
 +	else
 +		nm_log_warn (LOGD_MB, "could not get proxy to the oFono Settings plugin.");
@@ -696,17 +736,23 @@
 +{
 +	NMModemOfono *self = NM_MODEM_OFONO (user_data);
 +	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
++	gboolean online;
 +
 +	nm_log_dbg (LOGD_MB, "in %s: %s", __func__, key);
 +
 +	if (g_strcmp0 (key, "Online") == 0 && G_VALUE_HOLDS_BOOLEAN (value)) {
-+		priv->modem_online = g_value_get_boolean (value);
-+		nm_log_info (LOGD_MB, "(%s) modem is now %s",
-+		             nm_modem_get_path (NM_MODEM (self)),
-+		             priv->modem_online ? "Online" : "Offline");
-+		update_ofono_enabled (self, priv->modem_online
-+		                            && priv->gprs_powered
-+		                            && priv->gprs_attached);
++
++		online = g_value_get_boolean (value);
++		if (online != priv->modem_online) {
++			priv->modem_online = online;
++
++			nm_log_info (LOGD_MB, "(%s) modem is now %s",
++			             nm_modem_get_path (NM_MODEM (self)),
++			             online ? "Online" : "Offline");
++
++			update_modem_state (self);
++		}
++
 +	} else if (g_strcmp0 (key, "Interfaces") == 0 && G_VALUE_HOLDS_BOXED (value)) {
 +		gboolean found_simmanager = FALSE;
 +		gboolean found_conn_manager = FALSE;
@@ -729,26 +775,48 @@
 +				priv->simmanager_proxy = get_ofono_proxy (self,
 +				                                          nm_modem_get_path (NM_MODEM (self)),
 +				                                          OFONO_DBUS_INTERFACE_SIM_MANAGER);
++				dbus_g_proxy_add_signal (priv->simmanager_proxy, "PropertyChanged",
++				                         G_TYPE_STRING, G_TYPE_VALUE,
++				                         G_TYPE_INVALID);
++				dbus_g_proxy_connect_signal (priv->simmanager_proxy, "PropertyChanged",
++				                             G_CALLBACK (ofono_sim_properties_changed),
++				                             self,
++				                             NULL);
++
++				dbus_g_proxy_begin_call_with_timeout (priv->simmanager_proxy,
++				                                      "GetProperties",
++				                                      get_ofono_sim_properties_done,
++				                                      self, NULL, 20000,
++				                                      G_TYPE_INVALID);
 +			}
-+		} else {
-+			if (priv->simmanager_proxy) {
++		} else if (priv->simmanager_proxy) {
 +				nm_log_info (LOGD_MB, "(%s): SimManager interface disappeared",
 +				             nm_modem_get_path (NM_MODEM (self)));
 +				g_object_unref (priv->simmanager_proxy);
 +				priv->simmanager_proxy = NULL;
-+			}
++
++				g_free (priv->imsi);
++				priv->imsi = NULL;
++
++				update_modem_state (self);
 +		}
 +
 +		if (found_conn_manager) {
 +			if (!priv->connman_proxy) {
 +				nm_log_info (LOGD_MB, "(%s): found new ConnectionManager interface",
 +				             nm_modem_get_path (NM_MODEM (self)));
++
 +				priv->connman_proxy = get_ofono_proxy (self,
 +				                                       nm_modem_get_path (NM_MODEM (self)),
 +				                                       OFONO_DBUS_INTERFACE_CONNECTION_MANAGER);
 +
 +				if (priv->connman_proxy) {
-+					get_ofono_conn_manager_properties (self);
++
++					dbus_g_proxy_begin_call_with_timeout (priv->connman_proxy,
++					                                      "GetProperties",
++					                                      get_ofono_conn_manager_properties_done,
++					                                      self, NULL, 20000,
++					                                      G_TYPE_INVALID);
 +
 +					dbus_g_proxy_add_signal (priv->connman_proxy, "PropertyChanged",
 +					                         G_TYPE_STRING, G_TYPE_VALUE,
@@ -774,20 +842,18 @@
 +					                             NULL);
 +				}
 +			}
-+		} else {
-+			if (priv->connman_proxy) {
-+				nm_log_info (LOGD_MB, "(%s): ConnectionManager interface disappeared",
-+				             nm_modem_get_path (NM_MODEM (self)));
-+				g_object_unref (priv->connman_proxy);
-+				priv->connman_proxy = NULL;
-+
-+				/* The connection manager proxy disappeared, we should
-+				 * consider the modem disabled.
-+				 */
-+				update_ofono_enabled (self, FALSE);
-+				priv->gprs_powered = FALSE;
-+				priv->gprs_attached = FALSE;
-+			}
++		} else if (priv->connman_proxy) {
++			nm_log_info (LOGD_MB, "(%s): ConnectionManager interface disappeared",
++			             nm_modem_get_path (NM_MODEM (self)));
++			g_object_unref (priv->connman_proxy);
++			priv->connman_proxy = NULL;
++
++			/* The connection manager proxy disappeared, we should
++			 * consider the modem disabled.
++			 */
++			priv->gprs_attached = FALSE;
++
++			update_modem_state (self);
 +		}
 +	}
 +}
@@ -1218,11 +1284,8 @@
 +	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
 +	NMSettingConnection *s_con;
 +	NMSettingGsm *s_gsm;
-+	GHashTable *properties;
-+	GError *error = NULL;
 +	const char *uuid;
 +	const char *id;
-+	const char *imsi;
 +
 +	s_con = nm_connection_get_setting_connection (connection);
 +	g_assert (s_con);
@@ -1244,27 +1307,12 @@
 +		return FALSE;
 +	}
 +
-+	dbus_g_proxy_call_with_timeout (priv->simmanager_proxy,
-+	                                "GetProperties",
-+	                                20000,
-+	                                &error,
-+	                                G_TYPE_INVALID,
-+	                                DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
-+	                                G_TYPE_INVALID);
-+
-+	if (error) {
-+		nm_log_warn (LOGD_MB, "Could not get SIM properties to match connections: %s",
-+		             error && error->message ? error->message : "(unknown)");
-+		g_clear_error (&error);
-+	}
-+
-+	imsi = g_value_get_string (g_hash_table_lookup (properties, "SubscriberIdentity"));
-+	if (! g_strrstr (id, imsi)) {
++	if (! g_strrstr (id, priv->imsi)) {
 +		nm_log_dbg (LOGD_MB, "%s (%s) isn't for the right SIM, skipping.", id, uuid);
 +		return FALSE;
 +	}
 +
-+	nm_log_dbg (LOGD_MB, "%s (%s) looks compatible with IMSI %s", id, uuid, imsi);
++	nm_log_dbg (LOGD_MB, "%s (%s) looks compatible with IMSI %s", id, uuid, priv->imsi);
 +
 +	return TRUE;
 +}
@@ -1280,8 +1328,8 @@
 +	nm_log_dbg (LOGD_MB, "in %s", __func__);
 +
 +	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
-+	                            DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
-+	                            G_TYPE_INVALID)) {
++		                        DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
++		                        G_TYPE_INVALID)) {
 +		nm_log_warn (LOGD_MB, "failed get modem enabled state: (%d) %s",
 +		             error ? error->code : -1,
 +		             error && error->message ? error->message : "(unknown)");
@@ -1314,27 +1362,6 @@
 +}
 +
 +static void
-+set_ofono_enabled (NMModem *self, gboolean enabled)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+
-+	nm_log_info (LOGD_MB, "(%s): trying to set modem to %s",
-+	             nm_modem_get_path (self),
-+	             enabled ? "enabled" : "disabled");
-+
-+	/*
-+	 * FIXME: this is code is a no-op; we should either make
-+	 * work, or get rid of this function, or at least remove
-+	 * the call to update_ofono_enabled.
-+	 */
-+
-+	update_ofono_enabled (NM_MODEM_OFONO (self),
-+	                      priv->modem_online
-+	                      && priv->gprs_powered
-+	                      && priv->gprs_attached);
-+}
-+
-+static void
 +get_capabilities (NMModem *_self,
 +                  NMDeviceModemCapabilities *modem_caps,
 +                  NMDeviceModemCapabilities *current_caps)
@@ -1361,7 +1388,6 @@
 +	priv->simmanager_proxy = NULL;
 +
 +	priv->modem_online = FALSE;
-+	priv->gprs_powered = FALSE;
 +	priv->gprs_attached = FALSE;
 +
 +	priv->ip4_config = NULL;
@@ -1413,18 +1439,25 @@
 +
 +	nm_log_dbg (LOGD_MB, "in %s", __func__);
 +
-+	if (priv->connect_properties)
++	if (priv->connect_properties) {
 +		g_hash_table_destroy (priv->connect_properties);
++		priv->connect_properties = NULL;
++	}
 +
 +	if (priv->ip4_config)
-+		g_object_unref (priv->ip4_config);
++		g_clear_object (&priv->ip4_config);
 +
 +	if (priv->modem_proxy)
-+		g_object_unref (priv->modem_proxy);
++		g_clear_object (&priv->modem_proxy);
 +	if (priv->connman_proxy)
-+		g_object_unref (priv->connman_proxy);
++		g_clear_object (&priv->connman_proxy);
 +	if (priv->context_proxy)
-+		g_object_unref (priv->context_proxy);
++		g_clear_object (&priv->context_proxy);
++
++	if (priv->imsi) {
++		g_free (priv->imsi);
++		priv->imsi = NULL;
++	}
 +
 +	G_OBJECT_CLASS (nm_modem_ofono_parent_class)->dispose (object);
 +}
@@ -1444,7 +1477,6 @@
 +	object_class->dispose = dispose;
 +
 +	modem_class->get_capabilities = get_capabilities;
-+	modem_class->set_mm_enabled = set_ofono_enabled;
 +	modem_class->disconnect = disconnect;
 +	modem_class->deactivate = deactivate;
 +	modem_class->check_connection_compatible = check_connection_compatible;

=== added file 'debian/patches/lp1445080-modify-device-modem-avail.patch'
--- debian/patches/lp1445080-modify-device-modem-avail.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1445080-modify-device-modem-avail.patch	2015-07-17 20:04:14 +0000
@@ -0,0 +1,44 @@
+Author: Tony Espy <[e-mail]>
+Subject: Modify NMDeviceModem's available logic
+
+This patch modifies NMDeviceModem's available logic such that
+the device is only considered available if the modem_state is
+>= NM_MODEM_STATE_REGISTERED.  NMDevice defines 'available' as
+meaning the device is in such a state that it can be activated.
+This change prevents NM from trying to activate a modem which
+is not yet ready to be activated.
+
+Bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1445080
+
+Index: network-manager-0.9.10.0/src/devices/wwan/nm-device-modem.c
+===================================================================
+--- network-manager-0.9.10.0.orig/src/devices/wwan/nm-device-modem.c
++++ network-manager-0.9.10.0/src/devices/wwan/nm-device-modem.c
+@@ -340,8 +340,6 @@ check_connection_available (NMDevice *de
+ 		return FALSE;
+ 
+ 	state = nm_modem_get_state (priv->modem);
+-	if (state <= NM_MODEM_STATE_INITIALIZING)
+-		return FALSE;
+ 
+ 	if (state == NM_MODEM_STATE_LOCKED) {
+ 		NMSettingGsm *s_gsm = nm_connection_get_setting_gsm (connection);
+@@ -351,6 +349,9 @@ check_connection_available (NMDevice *de
+ 			return FALSE;
+ 	}
+ 
++	if (state <= NM_MODEM_STATE_SEARCHING)
++		return FALSE;
++
+ 	return TRUE;
+ }
+ 
+@@ -475,7 +476,7 @@ is_available (NMDevice *dev)
+ 
+ 	g_assert (priv->modem);
+ 	modem_state = nm_modem_get_state (priv->modem);
+-	if (modem_state <= NM_MODEM_STATE_INITIALIZING) {
++	if (modem_state <= NM_MODEM_STATE_SEARCHING) {
+ 		nm_log_dbg (LOGD_MB, "(%s): not available because modem is not ready (%s)",
+ 		            nm_device_get_iface (dev),
+ 		            nm_modem_state_to_string (modem_state));

=== added file 'debian/patches/lp1445080-nm-modem-check-for-set-mm-enabled-func.patch'
--- debian/patches/lp1445080-nm-modem-check-for-set-mm-enabled-func.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1445080-nm-modem-check-for-set-mm-enabled-func.patch	2015-07-17 20:04:14 +0000
@@ -0,0 +1,28 @@
+Author: Tony Espy <[e-mail]>
+Subject: NMModem: check for child class' set_mm_enabled func before calling
+
+This patch add a check to NMModem's set_mm_enabled function
+to check that a sub-class defines the function before calling
+it.  Some modem implementation, such as NMModemOfono, don't
+define a set_mm_enabled function, as this control of ofono's
+modem 'Online' property is handled externally by urfkill.
+
+Bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1445080
+
+---
+
+Index: network-manager-0.9.10.0/src/devices/wwan/nm-modem.c
+===================================================================
+--- network-manager-0.9.10.0.orig/src/devices/wwan/nm-modem.c
++++ network-manager-0.9.10.0/src/devices/wwan/nm-modem.c
+@@ -203,7 +203,9 @@ nm_modem_set_mm_enabled (NMModem *self,
+ 		return;
+ 	}
+ 
+-	NM_MODEM_GET_CLASS (self)->set_mm_enabled (self, enabled);
++	/* Not all modem classes support set_mm_enabled */
++	if (NM_MODEM_GET_CLASS (self)->set_mm_enabled)
++		NM_MODEM_GET_CLASS (self)->set_mm_enabled (self, enabled);
+ 
+ 	/* Pre-empt the state change signal */
+ 	nm_modem_set_state (self,

=== modified file 'debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch'
--- debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch	2015-07-17 20:04:13 +0000
+++ debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch	2015-07-17 20:04:14 +0000
@@ -10,10 +10,10 @@
 
 ---
 
-Index: b/src/nm-policy.c
+Index: network-manager-0.9.10.0/src/nm-policy.c
 ===================================================================
---- a/src/nm-policy.c
-+++ b/src/nm-policy.c
+--- network-manager-0.9.10.0.orig/src/nm-policy.c
++++ network-manager-0.9.10.0/src/nm-policy.c
 @@ -1229,7 +1229,7 @@ sleeping_changed (NMManager *manager, GP
  }
  
@@ -83,8 +83,8 @@
 +			nm_log_info (LOGD_DEVICE, "Connection '%s' disconnected, scheduling activate_check in %u seconds.",
 +			             nm_connection_get_id (NM_CONNECTION (connection)), delay);
 +		else
-+			nm_log_info (LOGD_DEVICE, "Device has no connection; scheduling activate_check in %u seconds.",
-+			             delay);
++			nm_log_info (LOGD_DEVICE, "Device '%s' has no connection; scheduling activate_check in %u seconds.",
++			             nm_device_get_iface (device), delay);
 +
 +		schedule_activate_check (policy, device, delay);
  		break;

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-07-17 20:04:13 +0000
+++ debian/patches/series	2015-07-17 20:04:14 +0000
@@ -66,6 +66,8 @@
 lp1461593-add-nm-settings-connection-reset-retries-methods.patch
 add_ofono_settings_support.patch
 lp1461593-add-modem-reconnect-delay-to-policy.patch
+lp1445080-modify-device-modem-avail.patch
+lp1445080-nm-modem-check-for-set-mm-enabled-func.patch
 
 # killswitch
 ignore_rfkill_if_urfkill_is_present.patch