Merge ~awe/network-manager/+git/ubuntu:touch-sync into network-manager:master

[Tony Espy]

These changes update the Touch-specific patches to NM including:

 - updating the manager device patches ( rild & p2p )
 - updating the core wwan ofono plugin changes
 - restored the modem re-connect delay patch
 - added two wpa_supplicant related scan patches
 - added ofono mobile data connection patch ( see changelog for bug #s )

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:0
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/343/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/957/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/343/rebuild

review: Needs Fixing (continuous-integration)

Unmerged commits

f4daef8... by Tony Espy on 2016-06-03

Add d/p/wwan-fix-ofono-connection-problems (LP: #1565717, #1579098).

5a80502... by Tony Espy on 2016-06-03

Re-stored missing patches from Touch

 - Add-modem-reconnect-delay* (LP: #1461593)
 - wpa_suppl scan fixes

763d6e6... by Tony Espy on 2016-06-03

Resync base wwan ofono patch from Touch

The Touch NMManager device patches were updated after the
1.1.93 landed in xenial.

b04b54c... by Tony Espy on 2016-06-03

Resync nm-manager device patches from Touch

The Touch NMManager device patches were updated after the
1.1.93 landed in xenial.

b484744... by Tony Espy on 2016-06-03

Restore d/p/*.patch 'Bug-Ubuntu' headers

4a813ea... by Aron Xu on 2016-06-04

Cherry pick patch for WPA* Enterprise private key file (LP: #1575614)

9f40397... by Mathieu Trudel-Lapierre on 2016-06-03

Merge branch 'powersave'

86247f2... by Aron Xu on 2016-06-02

Use VCS-Git to make git the authoritative repo

63147ed... by Mathieu Trudel-Lapierre on 2016-05-31

debian/patches/libnm-Check-self-still-NMManager-or-not.patch: updated and refreshed to make gbp pq happy.

087c60b... by Mathieu Trudel-Lapierre on 2016-05-31

releasing package network-manager version 1.2.2-0ubuntu3

diff --git a/debian/changelog b/debian/changelog
index 23fbc78..1c1e9d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
 network-manager (1.2.2-0ubuntu4) UNRELEASED; urgency=medium
 
+  [ Mathieu Trudel-Lapierre ]
   * debian/patches/libnm-Check-self-still-NMManager-or-not.patch: updated and
     refreshed to make gbp pq happy.
 
+  [ Tony Espy ]
+  * debian/patches/Ignore*: re-sync nm-manager device patches from Touch.
+  * debian/patches/wwan-add-support*, Modify-NMDeviceModem-s-available*: re-sync
+    base ofono wwan patches from Touch.
+  * debian/patches/Add-modem-reconnect-delay*: re-store missing Touch patch.
+  * debian/patches/Clear-WiFi-requested_scan*: include wpa_supplicant scan patches
+    from Touch.
+  * debian/patches/wwan-fix-ofono-connection*: new patch to address ofono data
+    re-connect problems (LP: #1565717, #1579098).
+
  -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 31 May 2016 13:37:01 -0400
 
 network-manager (1.2.2-0ubuntu3) yakkety; urgency=medium
diff --git a/debian/patches/Add-modem-reconnect-delay-to-policy.patch b/debian/patches/Add-modem-reconnect-delay-to-policy.patch
new file mode 100644
index 0000000..5bdb503
--- /dev/null
+++ b/debian/patches/Add-modem-reconnect-delay-to-policy.patch
@@ -0,0 +1,115 @@
+From: Tony Espy <[e-mail]>
+Date: Tue, 24 May 2016 20:59:42 -0400
+Subject: Add modem reconnect delay to policy
+
+This patch introduces a 5s delay between retry activations
+for modem devices.  Otherwise, the activation attempts can
+flood the modem all at once, and then trigger the reset_retries
+timeout ( which defaults to 300s ).
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1461593
+---
+ src/nm-policy.c | 34 +++++++++++++++++++++++++++-------
+ 1 file changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/src/nm-policy.c b/src/nm-policy.c
+index 07bcce8..5c59604 100644
+--- a/src/nm-policy.c
++++ b/src/nm-policy.c
+@@ -931,7 +931,7 @@ sleeping_changed (NMManager *manager, GParamSpec *pspec, gpointer user_data)
+ }
+ 
+ static void
+-schedule_activate_check (NMPolicy *self, NMDevice *device)
++schedule_activate_check (NMPolicy *self, NMDevice *device, guint delay)
+ {
+ 	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self);
+ 	ActivateData *data;
+@@ -960,7 +960,12 @@ schedule_activate_check (NMPolicy *self, NMDevice *device)
+ 	data = g_slice_new0 (ActivateData);
+ 	data->policy = self;
+ 	data->device = g_object_ref (device);
+-	data->autoactivate_id = g_idle_add (auto_activate_device, data);
++
++	if (delay)
++		data->autoactivate_id = g_timeout_add_seconds (delay, auto_activate_device, data);
++	else
++		data->autoactivate_id = g_idle_add (auto_activate_device, data);
++
+ 	priv->pending_activation_checks = g_slist_append (priv->pending_activation_checks, data);
+ }
+ 
+@@ -1155,6 +1160,7 @@ device_state_changed (NMDevice *device,
+ 	NMIP4Config *ip4_config;
+ 	NMIP6Config *ip6_config;
+ 	NMSettingConnection *s_con = NULL;
++	guint delay = 0;
+ 
+ 	switch (new_state) {
+ 	case NM_DEVICE_STATE_FAILED:
+@@ -1172,7 +1178,7 @@ device_state_changed (NMDevice *device,
+ 
+ 				nm_settings_connection_set_autoconnect_blocked_reason (connection, NM_DEVICE_STATE_REASON_NO_SECRETS);
+ 			} else if (tries > 0) {
+-				_LOGD (LOGD_DEVICE, "connection '%s' failed to autoconnect; %d tries left",
++				_LOGI (LOGD_DEVICE, "connection '%s' failed to autoconnect; %d tries left",
+ 				       nm_settings_connection_get_id (connection), tries);
+ 				nm_settings_connection_set_autoconnect_retries (connection, tries - 1);
+ 			}
+@@ -1183,6 +1189,10 @@ device_state_changed (NMDevice *device,
+ 				/* Schedule a handler to reset retries count */
+ 				if (!priv->reset_retries_id) {
+ 					gint32 retry_time = nm_settings_connection_get_autoconnect_retry_time (connection);
++					gint32 actual_time = MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ());
++
++					_LOGI (LOGD_DEVICE, "Disabling autoconnect for connection '%s'; setting retry of %d.",
++						   nm_connection_get_id (NM_CONNECTION (connection)), actual_time);
+ 
+ 					g_warn_if_fail (retry_time != 0);
+ 					priv->reset_retries_id = g_timeout_add_seconds (MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ()), reset_connections_retries, self);
+@@ -1250,7 +1260,17 @@ device_state_changed (NMDevice *device,
+ 			update_routing_and_dns (self, FALSE);
+ 
+ 		/* Device is now available for auto-activation */
+-		schedule_activate_check (self, device);
++		if (nm_device_get_device_type (device) == NM_DEVICE_TYPE_MODEM)
++			delay = 5;
++
++		if (connection)
++			_LOGI (LOGD_DEVICE, "Connection '%s' disconnected, scheduling activate_check in %u seconds.",
++				nm_connection_get_id (NM_CONNECTION (connection)), delay);
++		else
++			_LOGI (LOGD_DEVICE, "Device '%s' has no connection; scheduling activate_check in %u seconds.",
++				nm_device_get_iface (device), delay);
++
++		schedule_activate_check (self, device, delay);
+ 		break;
+ 
+ 	case NM_DEVICE_STATE_PREPARE:
+@@ -1363,7 +1383,7 @@ device_autoconnect_changed (NMDevice *device,
+ 	NMPolicy *self = priv->self;
+ 
+ 	if (nm_device_autoconnect_allowed (device))
+-		schedule_activate_check (self, device);
++		schedule_activate_check (self, device, 0);
+ }
+ 
+ static void
+@@ -1372,7 +1392,7 @@ device_recheck_auto_activate (NMDevice *device, gpointer user_data)
+ 	NMPolicyPrivate *priv = user_data;
+ 	NMPolicy *self = priv->self;
+ 
+-	schedule_activate_check (self, device);
++	schedule_activate_check (self, device, 0);
+ }
+ 
+ static void
+@@ -1586,7 +1606,7 @@ schedule_activate_all (NMPolicy *self)
+ 	const GSList *iter;
+ 
+ 	for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter))
+-		schedule_activate_check (self, NM_DEVICE (iter->data));
++		schedule_activate_check (self, NM_DEVICE (iter->data), 0);
+ }
+ 
+ static void
diff --git a/debian/patches/Add-new-NMSettingsConnection-reset_retries-get-set-m.patch b/debian/patches/Add-new-NMSettingsConnection-reset_retries-get-set-m.patch
index 3fc4826..a10ac51 100644
--- a/debian/patches/Add-new-NMSettingsConnection-reset_retries-get-set-m.patch
+++ b/debian/patches/Add-new-NMSettingsConnection-reset_retries-get-set-m.patch
@@ -6,7 +6,7 @@ This patch adds get/set methods to NMSettingsConnection for the
 reset_retries_timeout.  This allows sub-classes to override the
 default setting ( 300s ).
 
-Bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1461593
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1461593
 ---
  src/settings/nm-settings-connection.c | 18 +++++++++++++++++-
  src/settings/nm-settings-connection.h |  3 +++
diff --git a/debian/patches/Clear-WiFi-requested_scan-if-suppl-exits.patch b/debian/patches/Clear-WiFi-requested_scan-if-suppl-exits.patch
new file mode 100644
index 0000000..88f9891
--- /dev/null
+++ b/debian/patches/Clear-WiFi-requested_scan-if-suppl-exits.patch
@@ -0,0 +1,38 @@
+From: Tony Espy <[e-mail]>
+Date: Tue, 24 May 2016 21:36:20 -0400
+Subject: Clear WiFi requested_scan if suppl exits
+
+It's possible for wpa_supplicant to exit with an
+outstanding requested_scan pending.  This can lead
+to a stall condition where scanning no longer occurs.
+---
+ src/devices/wifi/nm-device-wifi.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
+index f6325a6..b147409 100644
+--- a/src/devices/wifi/nm-device-wifi.c
++++ b/src/devices/wifi/nm-device-wifi.c
+@@ -246,6 +246,13 @@ supplicant_interface_release (NMDeviceWifi *self)
+ 
+ 	priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+ 
++	if (priv->requested_scan) {
++		nm_log_dbg (LOGD_WIFI_SCAN, "(%s): reset requested_scan flag to FALSE",
++					nm_device_get_iface (NM_DEVICE (self)));
++		priv->requested_scan = FALSE;
++		nm_device_remove_pending_action (NM_DEVICE (self), "scan", TRUE);
++	}
++
+ 	nm_clear_g_source (&priv->pending_scan_id);
+ 
+ 	/* Reset the scan interval to be pretty frequent when disconnected */
+@@ -1915,7 +1922,7 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface,
+ 				priv->requested_scan = FALSE;
+ 			}
+ 
+-			cancel_pending_scan (self);
++			nm_clear_g_source (&priv->pending_scan_id);
+ 			request_wireless_scan (self, NULL);
+ 		}
+ 	default:
diff --git a/debian/patches/Clear-WiFi-requested_scan-if-suppl-goes-INACTIVE.patch b/debian/patches/Clear-WiFi-requested_scan-if-suppl-goes-INACTIVE.patch
new file mode 100644
index 0000000..d81b534
--- /dev/null
+++ b/debian/patches/Clear-WiFi-requested_scan-if-suppl-goes-INACTIVE.patch
@@ -0,0 +1,37 @@
+From: Tony Espy <[e-mail]>
+Date: Tue, 24 May 2016 21:22:48 -0400
+Subject: Clear WiFi requested_scan if suppl goes INACTIVE
+
+It's possible for wpa_supplicant to transition to INACTIVE
+state with an outstanding requested_scan pending.  This can
+lead to a stall condition where scanning no longer occurs.
+---
+ src/devices/wifi/nm-device-wifi.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
+index bacd5e6..f6325a6 100644
+--- a/src/devices/wifi/nm-device-wifi.c
++++ b/src/devices/wifi/nm-device-wifi.c
+@@ -1903,6 +1903,21 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface,
+ 		else
+ 			_LOGI (LOGD_DEVICE | LOGD_WIFI, "supplicant interface keeps failing, giving up");
+ 		break;
++	case NM_SUPPLICANT_INTERFACE_STATE_INACTIVE:
++		if (old_state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING) {
++			nm_log_warn (LOGD_HW | LOGD_WIFI, "(%s): supplicant state: SCANNING -> INACTIVE",
++						 nm_device_get_iface (NM_DEVICE (self)));
++
++			if (priv->requested_scan) {
++				nm_log_dbg (LOGD_WIFI_SCAN, "(%s): clearing requested_scan",
++							nm_device_get_iface (NM_DEVICE (self)));
++
++				priv->requested_scan = FALSE;
++			}
++
++			cancel_pending_scan (self);
++			request_wireless_scan (self, NULL);
++		}
+ 	default:
+ 		break;
+ 	}
diff --git a/debian/patches/Filter-DNS-servers-to-add-to-dnsmasq-based-on-availa.patch b/debian/patches/Filter-DNS-servers-to-add-to-dnsmasq-based-on-availa.patch
index fae01f9..648dd6f 100644
--- a/debian/patches/Filter-DNS-servers-to-add-to-dnsmasq-based-on-availa.patch
+++ b/debian/patches/Filter-DNS-servers-to-add-to-dnsmasq-based-on-availa.patch
@@ -3,6 +3,7 @@ Date: Fri, 13 May 2016 11:00:11 +0800
 Subject: Filter DNS servers to add to dnsmasq based on availability and VPN
  status
 
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/898224
 ---
  src/dns-manager/nm-dns-dnsmasq.c | 47 +++++++++++++++++++++++++++++++++-------
  1 file changed, 39 insertions(+), 8 deletions(-)
diff --git a/debian/patches/Ignore-p2p-wifi-devices-from-android.patch b/debian/patches/Ignore-p2p-wifi-devices-from-android.patch
new file mode 100644
index 0000000..c09e7d3
--- /dev/null
+++ b/debian/patches/Ignore-p2p-wifi-devices-from-android.patch
@@ -0,0 +1,34 @@
+From: Tony Espy <[e-mail]>
+Date: Fri, 3 Jun 2016 15:50:53 -0400
+Subject: Ignore p2p wifi devices from android
+
+This patch causes NMManager to ignore any p2p WiFi
+devices exposed by Android WiFi drivers.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1099983
+---
+ src/nm-manager.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index c2ed1da..8cf70c7 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -2097,6 +2097,17 @@ platform_link_added (NMManager *self,
+ 			return;
+ 		}
+ 
++		/*
++		 * Ubuntu: Explicitly unmanage all p2p Wi-Fi devices which are
++		 * managed externally in the case of Wi-Fi Direct.
++		 */
++		NMDeviceType devtype = nm_device_get_device_type (device);
++		if ((plink->type == NM_LINK_TYPE_WIFI)
++			&& g_strstr_len (plink->name, NM_STRLEN ("p2p"), "p2p")) {
++			nm_log_info (LOGD_HW, "(%s): ignoring P2P wireless iface", plink->name);
++			return;
++		}
++
+ 		device = nm_device_factory_create_device (factory, plink->name, plink, NULL, &ignore, &error);
+ 		if (!device) {
+ 			if (!ignore) {
diff --git a/debian/patches/Ignore-p2p0-wifi-devices-from-android.patch b/debian/patches/Ignore-p2p0-wifi-devices-from-android.patch
deleted file mode 100644
index c567c96..0000000
--- a/debian/patches/Ignore-p2p0-wifi-devices-from-android.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Date: Fri, 13 May 2016 11:08:30 +0800
-Subject: Ignore p2p0 wifi devices from android.
-
----
- src/nm-manager.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 769662c..b770139 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -2105,6 +2105,16 @@ platform_link_added (NMManager *self,
- 		!strncmp (plink->name, "ccmni", NM_STRLEN ("ccmni")))
- 		return;
- 
-+	/*
-+	 * Ubuntu: Explicitly unmanage p2p Wi-Fi devices exposed by Android JB Wi-Fi drivers.
-+	 */
-+	NMDeviceType devtype = nm_device_get_device_type (device);
-+	if ((plink->type == NM_LINK_TYPE_WIFI)
-+	    && !strncmp (plink->name, "p2p0", NM_STRLEN ("p2p0"))) {
-+		nm_log_info (LOGD_HW, "(%s): ignoring P2P wireless iface", plink->name);
-+		return;
-+	}
-+
- 	if (device == NULL) {
- 		switch (plink->type) {
- 		case NM_LINK_TYPE_WWAN_ETHERNET:
diff --git a/debian/patches/Ignore-rild-modem-devices.patch b/debian/patches/Ignore-rild-modem-devices.patch
new file mode 100644
index 0000000..c0cc6ae
--- /dev/null
+++ b/debian/patches/Ignore-rild-modem-devices.patch
@@ -0,0 +1,27 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Date: Fri, 13 May 2016 11:08:17 +0800
+Subject: Ignore rild modem devices.
+
+---
+ src/nm-manager.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index 10aa3d7..c2ed1da 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -2089,6 +2089,14 @@ platform_link_added (NMManager *self,
+ 		gboolean ignore = FALSE;
+ 		gs_free_error GError *error = NULL;
+ 
++		/* Ignore rild modem devices, which will be handled by their modem parent */
++		if (g_strstr_len (plink->name, NM_STRLEN ("rmnet"), "rmnet") ||
++			g_strstr_len (plink->name, NM_STRLEN ("rev_rmnet"), "rev_rmnet") ||
++			g_strstr_len (plink->name, NM_STRLEN ("ccmni"), "ccmni")) {
++			_LOGW (LOGD_HW, "Ignoring rild modem device: %s", plink->name);
++			return;
++		}
++
+ 		device = nm_device_factory_create_device (factory, plink->name, plink, NULL, &ignore, &error);
+ 		if (!device) {
+ 			if (!ignore) {
diff --git a/debian/patches/Ignore-rmnet_usbX-devices.patch b/debian/patches/Ignore-rmnet_usbX-devices.patch
deleted file mode 100644
index f973a5f..0000000
--- a/debian/patches/Ignore-rmnet_usbX-devices.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Date: Fri, 13 May 2016 11:08:17 +0800
-Subject: Ignore rmnet_usbX devices.
-
----
- src/nm-manager.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 10aa3d7..769662c 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -2099,6 +2099,12 @@ platform_link_added (NMManager *self,
- 		}
- 	}
- 
-+	/* Ignore rmnet_usb devices, which will be handled by their modem parent
-+	 */
-+	if (!strncmp (plink->name, "rmnet_usb", NM_STRLEN ("rmnet_usb")) ||
-+		!strncmp (plink->name, "ccmni", NM_STRLEN ("ccmni")))
-+		return;
-+
- 	if (device == NULL) {
- 		switch (plink->type) {
- 		case NM_LINK_TYPE_WWAN_ETHERNET:
diff --git a/debian/patches/Modify-NMDeviceModem-s-available-logic.patch b/debian/patches/Modify-NMDeviceModem-s-available-logic.patch
index 1630362..6f5a018 100644
--- a/debian/patches/Modify-NMDeviceModem-s-available-logic.patch
+++ b/debian/patches/Modify-NMDeviceModem-s-available-logic.patch
@@ -9,16 +9,16 @@ 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
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1445080
 ---
  src/devices/wwan/nm-device-modem.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
-index a7523f5..774fd24 100644
+index 39a34db..3bbd170 100644
 --- a/src/devices/wwan/nm-device-modem.c
 +++ b/src/devices/wwan/nm-device-modem.c
-@@ -428,14 +428,15 @@ check_connection_available (NMDevice *device,
+@@ -410,14 +410,15 @@ check_connection_available (NMDevice *device,
  		return FALSE;
  
  	state = nm_modem_get_state (priv->modem);
@@ -36,7 +36,7 @@ index a7523f5..774fd24 100644
  	return TRUE;
  }
  
-@@ -616,7 +617,7 @@ is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
+@@ -598,7 +599,7 @@ is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
  
  	g_assert (priv->modem);
  	modem_state = nm_modem_get_state (priv->modem);
diff --git a/debian/patches/Order-IPv6-nameservers-before-IPv4-for-dns-plugins-d.patch b/debian/patches/Order-IPv6-nameservers-before-IPv4-for-dns-plugins-d.patch
index 83d8940..0d67e33 100644
--- a/debian/patches/Order-IPv6-nameservers-before-IPv4-for-dns-plugins-d.patch
+++ b/debian/patches/Order-IPv6-nameservers-before-IPv4-for-dns-plugins-d.patch
@@ -13,6 +13,8 @@ This is a very simple implementation of such re-ordering, just add the IPv6
 nameservers first when building the list of IP configurations (which will
 include nameservers, search domains, etc.), the IPv4 data will be appended
 right after.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/936712
 ---
  src/dns-manager/nm-dns-manager.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/patches/Track-killswitch-change-signals-from-urfkill.patch b/debian/patches/Track-killswitch-change-signals-from-urfkill.patch
index 45b668e..f96673b 100644
--- a/debian/patches/Track-killswitch-change-signals-from-urfkill.patch
+++ b/debian/patches/Track-killswitch-change-signals-from-urfkill.patch
@@ -79,7 +79,7 @@ index 2495bbc..49028f1 100644
  if SUSPEND_RESUME_UPOWER
  libNetworkManager_la_SOURCES += nm-sleep-monitor-upower.c
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index b770139..04b0a43 100644
+index 8cf70c7..8f45b0f 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -34,6 +34,7 @@
@@ -108,7 +108,7 @@ index b770139..04b0a43 100644
  
  	gboolean startup;
  	gboolean devices_inited;
-@@ -5210,6 +5215,49 @@ dbus_connection_changed_cb (NMBusManager *dbus_mgr,
+@@ -5213,6 +5218,49 @@ dbus_connection_changed_cb (NMBusManager *dbus_mgr,
  
  /**********************************************************************/
  
@@ -158,7 +158,7 @@ index b770139..04b0a43 100644
  NM_DEFINE_SINGLETON_REGISTER (NMManager);
  
  NMManager *
-@@ -5231,6 +5279,44 @@ nm_connection_provider_get (void)
+@@ -5234,6 +5282,44 @@ nm_connection_provider_get (void)
  	return p;
  }
  
@@ -203,7 +203,7 @@ index b770139..04b0a43 100644
  NMManager *
  nm_manager_setup (const char *state_file,
                    gboolean initial_net_enabled,
-@@ -5311,16 +5397,38 @@ constructed (GObject *object)
+@@ -5314,16 +5400,38 @@ constructed (GObject *object)
  	                  "rfkill-changed",
  	                  G_CALLBACK (rfkill_manager_rfkill_changed_cb),
  	                  self);
diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch
index 20d8f91..3b83b82 100644
--- a/debian/patches/Update-dnsmasq-parameters.patch
+++ b/debian/patches/Update-dnsmasq-parameters.patch
@@ -6,7 +6,7 @@ Disable caching since it's a potential security issue (local dns cache poisoning
 
 See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolving
 
-=== modified file 'src/dns-manager/nm-dns-dnsmasq.c'
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/903854
 ---
  src/dns-manager/nm-dns-dnsmasq.c | 4 ++--
  src/dns-manager/nm-dns-manager.c | 6 +++---
diff --git a/debian/patches/series b/debian/patches/series
index 3e1150b..4657321 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,14 +12,18 @@ Order-IPv6-nameservers-before-IPv4-for-dns-plugins-d.patch
 Revert-wifi-disable-Ad-Hoc-WPA-connections-lp-905748.patch
 Replace-Ad-Hoc-WPA-None-support-with-IBSS-RSN-PSK.patch
 wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch
-Ignore-rmnet_usbX-devices.patch
-Ignore-p2p0-wifi-devices-from-android.patch
+Ignore-rild-modem-devices.patch
+Ignore-p2p-wifi-devices-from-android.patch
 wwan-add-support-for-using-oFono-as-a-modem-manager.patch
 Add-new-NMSettingsConnection-reset_retries-get-set-m.patch
 Let-NetworkManager-read-oFono-settings-file-and-crea.patch
+Add-modem-reconnect-delay-to-policy.patch
 Modify-NMDeviceModem-s-available-logic.patch
 Track-killswitch-change-signals-from-urfkill.patch
 Only-test-team-devices-if-we-built-support-for-them.patch
 Disable-general-with-expect-which-tends-to-fail-on-p.patch
 libnm-Check-self-still-NMManager-or-not.patch
 libnm-don-t-require-initialized-out_encrypted-argume.patch
+Clear-WiFi-requested_scan-if-suppl-goes-INACTIVE.patch
+Clear-WiFi-requested_scan-if-suppl-exits.patch
+wwan-fix-ofono-connection-problems.patch
diff --git a/debian/patches/wwan-add-support-for-using-oFono-as-a-modem-manager.patch b/debian/patches/wwan-add-support-for-using-oFono-as-a-modem-manager.patch
index cd18c65..377ec85 100644
--- a/debian/patches/wwan-add-support-for-using-oFono-as-a-modem-manager.patch
+++ b/debian/patches/wwan-add-support-for-using-oFono-as-a-modem-manager.patch
@@ -8,13 +8,13 @@ Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
 ---
  configure.ac                        |    9 +
  src/devices/wwan/Makefile.am        |    7 +
- src/devices/wwan/nm-device-modem.c  |   20 +
- src/devices/wwan/nm-modem-manager.c |  220 +++++-
- src/devices/wwan/nm-modem-ofono.c   | 1449 +++++++++++++++++++++++++++++++++++
+ src/devices/wwan/nm-device-modem.c  |    2 +
+ src/devices/wwan/nm-modem-manager.c |  241 +++++-
+ src/devices/wwan/nm-modem-ofono.c   | 1436 +++++++++++++++++++++++++++++++++++
  src/devices/wwan/nm-modem-ofono.h   |   64 ++
  src/devices/wwan/nm-modem.c         |    8 +-
  src/nm-core-utils.c                 |   20 +-
- 8 files changed, 1787 insertions(+), 10 deletions(-)
+ 8 files changed, 1766 insertions(+), 21 deletions(-)
  create mode 100644 src/devices/wwan/nm-modem-ofono.c
  create mode 100644 src/devices/wwan/nm-modem-ofono.h
 
@@ -57,7 +57,7 @@ index 1777eb3..65d9952 100644
  
  libnm_wwan_la_LDFLAGS = \
 diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
-index a8361c4..a7523f5 100644
+index a8361c4..39a34db 100644
 --- a/src/devices/wwan/nm-device-modem.c
 +++ b/src/devices/wwan/nm-device-modem.c
 @@ -100,6 +100,7 @@ modem_prepare_result (NMModem *modem,
@@ -68,39 +68,7 @@ index a8361c4..a7523f5 100644
  		if (reason == NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT) {
  			/* If the connect failed because the SIM PIN was wrong don't allow
  			 * the device to be auto-activated anymore, which would risk locking
-@@ -282,6 +283,16 @@ modem_state_cb (NMModem *modem,
- 		}
- 	}
- 
-+	if (dev_state >= NM_DEVICE_STATE_DISCONNECTED &&
-+		new_state == NM_MODEM_STATE_REGISTERED && old_state < NM_MODEM_STATE_REGISTERED) {
-+
-+		nm_log_info (LOGD_MB, "(%s): modem re-registered; re-checking autoconnect",
-+					 nm_device_get_iface (device));
-+
-+		g_object_set (G_OBJECT (device), NM_DEVICE_AUTOCONNECT, TRUE, NULL);
-+		nm_device_emit_recheck_auto_activate (device);
-+	}
-+
- 	if (new_state < NM_MODEM_STATE_CONNECTING &&
- 	    old_state >= NM_MODEM_STATE_CONNECTING &&
- 	    dev_state >= NM_DEVICE_STATE_NEED_AUTH &&
-@@ -345,6 +356,14 @@ device_state_changed (NMDevice *device,
- 		       nm_modem_state_to_string (nm_modem_get_state (priv->modem)));
- 	}
- 
-+	/* Block autoconnect until the modem is registered again */
-+	if (new_state == NM_DEVICE_STATE_FAILED && nm_modem_get_state (priv->modem) == NM_MODEM_STATE_SEARCHING) {
-+		nm_log_info (LOGD_MB, "(%s): modem searching; disabling autoconnect",
-+					 nm_device_get_iface (device));
-+
-+		g_object_set (G_OBJECT (device), NM_DEVICE_AUTOCONNECT, FALSE, NULL);
-+	}
-+
- 	nm_modem_device_state_changed (priv->modem, new_state, old_state, reason);
- 
- 	switch (reason) {
-@@ -545,6 +564,7 @@ get_ip_iface_identifier (NMDevice *device, NMUtilsIPv6IfaceId *out_iid)
+@@ -545,6 +546,7 @@ get_ip_iface_identifier (NMDevice *device, NMUtilsIPv6IfaceId *out_iid)
  
  	g_return_val_if_fail (priv->modem, FALSE);
  	success = nm_modem_get_iid (priv->modem, out_iid);
@@ -109,7 +77,7 @@ index a8361c4..a7523f5 100644
  		success = NM_DEVICE_CLASS (nm_device_modem_parent_class)->get_ip_iface_identifier (device, out_iid);
  	return success;
 diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c
-index 9e9bc13..0d1ec78 100644
+index 9e9bc13..cd97b87 100644
 --- a/src/devices/wwan/nm-modem-manager.c
 +++ b/src/devices/wwan/nm-modem-manager.c
 @@ -17,7 +17,7 @@
@@ -251,7 +219,7 @@ index 9e9bc13..0d1ec78 100644
 +{
 +	gchar *name_owner;
 +
-+	name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->ofono_proxy));
++	name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (self->priv->ofono_proxy));
 +	if (name_owner) {
 +		/* Available! */
 +		ofono_appeared (self);
@@ -324,7 +292,37 @@ index 9e9bc13..0d1ec78 100644
  
  static void
  modem_manager_poke_cb (GDBusConnection *connection,
-@@ -336,22 +518,44 @@ manager_new_ready (GObject *source,
+@@ -233,19 +415,18 @@ modem_manager_poke_cb (GDBusConnection *connection,
+ 
+ 	result = g_dbus_connection_call_finish (connection, res, &error);
+ 	if (error) {
+-		/* Ignore common errors when MM is not installed and such */
+-		if (   !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)
+-		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_EXEC_FAILED)
+-		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_FORK_FAILED)
+-		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_FAILED)
+-		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_TIMEOUT)
+-		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND)) {
+-			nm_log_dbg (LOGD_MB, "error poking ModemManager: %s", error->message);
++		nm_log_warn (LOGD_MB, "error poking ModemManager: %s",
++					error ? error->message : "");
++
++		/* Don't reschedule poke is MM service doesn't exist. */
++		if (!g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)
++			&& !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND)) {
++
++			/* Setup timeout to relaunch */
++			schedule_modem_manager_relaunch (self, MODEM_POKE_INTERVAL);
+ 		}
+-		g_error_free (error);
+ 
+-		/* Setup timeout to relaunch */
+-		schedule_modem_manager_relaunch (self, MODEM_POKE_INTERVAL);
++		g_error_free (error);
+ 	} else
+ 		g_variant_unref (result);
+ 
+@@ -336,22 +517,44 @@ manager_new_ready (GObject *source,
  static void
  ensure_client (NMModemManager *self)
  {
@@ -373,7 +371,7 @@ index 9e9bc13..0d1ec78 100644
  }
  
  static void
-@@ -430,6 +634,12 @@ dispose (GObject *object)
+@@ -430,6 +633,12 @@ dispose (GObject *object)
  
  	modem_manager_clear_signals (self);
  	g_clear_object (&self->priv->modem_manager);
@@ -388,10 +386,10 @@ index 9e9bc13..0d1ec78 100644
  	if (self->priv->modems) {
 diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/devices/wwan/nm-modem-ofono.c
 new file mode 100644
-index 0000000..162b88d
+index 0000000..4566be0
 --- /dev/null
 +++ b/src/devices/wwan/nm-modem-ofono.c
-@@ -0,0 +1,1449 @@
+@@ -0,0 +1,1436 @@
 +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 +/* NetworkManager -- Network link manager
 + *
@@ -604,12 +602,7 @@ index 0000000..162b88d
 +	nm_log_dbg (LOGD_MB, "(%s): modem disconnected",
 +				nm_modem_get_uid (NM_MODEM (self)));
 +
-+	/* NOTES(1.2): This doesn't accomplish anything as none of the attributes that
-+	 * are checked by update_modem_state are changed by this function!
-+	 *
-+	 *	update_modem_state (self);
-+	 */
-+
++	update_modem_state (self);
 +	disconnect_context_complete (ctx);
 +}
 +
@@ -784,7 +777,7 @@ index 0000000..162b88d
 +											   &error);
 +	if (!v_properties) {
 +		g_dbus_error_strip_remote_error (error);
-+		nm_log_warn (LOGD_BT, "(%s) error getting sim properties: %s",
++		nm_log_warn (LOGD_MB, "(%s) error getting sim properties: %s",
 +					 nm_modem_get_uid (NM_MODEM (self)),
 +		             error->message);
 +		g_error_free (error);
@@ -795,7 +788,7 @@ index 0000000..162b88d
 +
 +	v_dict = g_variant_get_child_value (v_properties, 0);
 +	if (!v_dict) {
-+		nm_log_warn (LOGD_BT, "(%s) error getting sim properties: no v_dict",
++		nm_log_warn (LOGD_MB, "(%s) error getting sim properties: no v_dict",
 +					 nm_modem_get_uid (NM_MODEM (self)));
 +		return;
 +	}
@@ -897,7 +890,7 @@ index 0000000..162b88d
 +		gboolean attached = g_variant_get_boolean (v);
 +
 +		nm_log_dbg (LOGD_MB, "(%s): Attached: %s",
-+					nm_modem_get_uid (NM_MODEM (self)), property ? "True" : "False");
++					nm_modem_get_uid (NM_MODEM (self)), attached ? "True" : "False");
 +
 +		if (priv->gprs_attached != attached) {
 +			priv->gprs_attached = attached;
@@ -941,7 +934,7 @@ index 0000000..162b88d
 +											   &error);
 +	if (!v_properties) {
 +		g_dbus_error_strip_remote_error (error);
-+		nm_log_warn (LOGD_BT, "(%s) error getting connman properties: %s",
++		nm_log_warn (LOGD_MB, "(%s) error getting connman properties: %s",
 +					 nm_modem_get_uid (NM_MODEM (self)),
 +		             error->message);
 +		g_error_free (error);
@@ -1121,7 +1114,7 @@ index 0000000..162b88d
 +											   &error);
 +	if (!v_properties) {
 +		g_dbus_error_strip_remote_error (error);
-+		nm_log_warn (LOGD_BT, "(%s) error getting modem properties: %s",
++		nm_log_warn (LOGD_MB, "(%s) error getting modem properties: %s",
 +					 nm_modem_get_uid (NM_MODEM (self)),
 +		             error->message);
 +		g_error_free (error);
@@ -1130,7 +1123,7 @@ index 0000000..162b88d
 +
 +	v_dict = g_variant_get_child_value (v_properties, 0);
 +	if (!v_dict) {
-+		nm_log_warn (LOGD_BT, "(%s) error getting modem properties: no v_dict",
++		nm_log_warn (LOGD_MB, "(%s) error getting modem properties: no v_dict",
 +					 nm_modem_get_uid (NM_MODEM (self)));
 +		return;
 +	}
@@ -1226,14 +1219,6 @@ index 0000000..162b88d
 +	nm_log_dbg (LOGD_MB, "PropertyChanged: %s", property);
 +
 +	/*
-+	 * 0.9.10.x:
-+	 *
-+	 * The old code got PropertyChanged for Settings, and then immediately
-+	 * called 'GetProperties' to get the current values of 'Settings'.
-+	 *
-+	 * There's no need to do this, as the PropertyChanged has the value of
-+	 * 'Settings' as its payload!!!
-+	 *
 +	 * TODO: might be a good idea and re-factor this to mimic bluez-device,
 +	 * ie. have this function just check the key, and call a sub-func to
 +	 * handle the action.
@@ -1242,24 +1227,14 @@ index 0000000..162b88d
 +	if (g_strcmp0 (property, "Settings") != 0)
 +		return;
 +
-+	nm_log_dbg (LOGD_MB, "found 'Settings' DICTIONARY property");
-+
-+	if (nm_modem_get_state (NM_MODEM (self)) == NM_MODEM_STATE_CONNECTED && g_variant_n_children (v) <= 0) {
-+		nm_log_warn (LOGD_MB, "ofono: (%s): Settings empty", nm_modem_get_uid (NM_MODEM (self)));
-+
-+		goto out;
-+	}
-+
-+	nm_log_info (LOGD_MB, "ofono: (%s): IPv4 static configuration:", nm_modem_get_uid (NM_MODEM (self)));
-+
 +	v_dict = g_variant_get_child_value (v, 0);
 +	if (!v_dict) {
-+		nm_log_warn (LOGD_BT, "ofono: (%s): error getting IPv4 Settings: no v_dict",
++		nm_log_warn (LOGD_MB, "ofono: (%s): error getting IPv4 Settings",
 +					 nm_modem_get_uid (NM_MODEM (self)));
-+		return;
++		goto out;
 +	}
 +
-+	/* NOTE - 0.9.10x code didn't fail if 'Interface' missing */
++	nm_log_info (LOGD_MB, "ofono: (%s): IPv4 static Settings:", nm_modem_get_uid (NM_MODEM (self)));
 +
 +	if (g_variant_lookup (v_dict, "Interface", "&s", &s)) {
 +
@@ -1271,7 +1246,7 @@ index 0000000..162b88d
 +						  NM_MODEM_IP4_METHOD, NM_MODEM_IP_METHOD_STATIC,
 +						  NULL);
 +		} else {
-+			nm_log_warn (LOGD_BT, "ofono: (%s): Settings 'Interface'; empty",
++			nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'Interface'; empty",
 +						nm_modem_get_uid (NM_MODEM (self)));
 +			goto out;
 +		}
@@ -1323,6 +1298,7 @@ index 0000000..162b88d
 +	} else {
 +		nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'Address' missing",
 +					nm_modem_get_uid (NM_MODEM (self)));
++		goto out;
 +	}
 +
 +	if (g_variant_lookup (v_dict, "Netmask", "&s", &s)) {
@@ -1345,7 +1321,9 @@ index 0000000..162b88d
 +		goto out;
 +	}
 +
-+	nm_log_info (LOGD_MB, "  address %s/%d", addr_s, prefix);
++	nm_log_info (LOGD_MB, "ofono (%s) Address: %s/%d",
++				 nm_modem_get_uid (NM_MODEM (self)), addr_s, prefix);
++
 +	nm_ip4_config_add_address (priv->ip4_config, &addr);
 +
 +	if (g_variant_lookup (v_dict, "Gateway", "&s", &s)) {
@@ -1372,7 +1350,7 @@ index 0000000..162b88d
 +
 +		while (*iter) {
 +			if (ip_string_to_network_address (*iter, &address_network) && address_network > 0) {
-+				nm_log_info (LOGD_MB, "ofono: (%s): DNS %s",
++				nm_log_info (LOGD_MB, "ofono: (%s): DNS: %s",
 +							nm_modem_get_uid (NM_MODEM (self)), *iter);
 +
 +				nm_ip4_config_add_nameserver (priv->ip4_config, address_network);
@@ -1384,13 +1362,15 @@ index 0000000..162b88d
 +			*iter++;
 +		}
 +
-+		/* TOOD: check for minimum NameServers >= 1? */
++		if (iter == array) {
++			nm_log_warn (LOGD_MB, "ofono: (%s): Settings: 'DomainNameServers': none specified",
++						 nm_modem_get_uid (NM_MODEM (self)));
++			g_free (array);
++			goto out;
++		}
 +
 +		g_free (array);
 +	} else {
-+
-+		/* NOTE - 0.9.10.x would not throw an error in this case!!! */
-+
 +		nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'DomainNameServers' missing",
 +					 nm_modem_get_uid (NM_MODEM (self)));
 +		goto out;
@@ -1419,14 +1399,19 @@ index 0000000..162b88d
 +	ret = TRUE;
 +
 +out:
-+	if (!ret)
-+		reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
++	if (nm_modem_get_state (NM_MODEM (self)) != NM_MODEM_STATE_CONNECTED) {
++		nm_log_info (LOGD_MB, "ofono: (%s): emitting PREPARE_RESULT: %s",
++					 nm_modem_get_uid (NM_MODEM (self)), ret ? "TRUE" : "FALSE");
 +
-+	nm_log_dbg (LOGD_MB, "(%s): DONE w/Settings; ret: %s",
-+				nm_modem_get_uid (NM_MODEM (self)), ret ? "TRUE" : "FALSE");
++		if (!ret)
++			reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
 +
-+	if (nm_modem_get_state (NM_MODEM (self)) != NM_MODEM_STATE_CONNECTED)
 +		g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, ret, reason);
++	} else {
++		nm_log_warn (LOGD_MB, "ofono: (%s): MODEM_PPP_FAILED", nm_modem_get_uid (NM_MODEM (self)));
++
++		g_signal_emit_by_name (self, NM_MODEM_PPP_FAILED, NM_DEVICE_STATE_REASON_PPP_FAILED);
++	}
 +}
 +
 +static NMActStageReturn
diff --git a/debian/patches/wwan-fix-ofono-connection-problems.patch b/debian/patches/wwan-fix-ofono-connection-problems.patch
new file mode 100644
index 0000000..bff500d
--- /dev/null
+++ b/debian/patches/wwan-fix-ofono-connection-problems.patch
@@ -0,0 +1,343 @@
+From: Tony Espy <[e-mail]>
+Date: Fri, 3 Jun 2016 18:03:32 -0400
+Subject: Fix ofono connection problems
+
+This patch fixes three (re) connection problems with
+the ofono plugin:
+
+1) If the modem is connected, and registrations drops,
+and then is restored, the connection isn't re-activated.
+The fix was simply to change modem_state_cb to not return
+after setting the state to failed, which allows nm_device_
+queue_recheck_available to be called, which queues a state
+transition to UNAVAILABLE.
+
+2) If ofono returns InProgress, don't treat as a PREPARE_FAILURE.
+
+3) If the ofono conext is already active, use it's existing
+'Settings' property to configure the device.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1565717
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1579098
+---
+ src/devices/wwan/nm-device-modem.c |   4 +-
+ src/devices/wwan/nm-modem-ofono.c  | 193 +++++++++++++++++++++++++++----------
+ src/devices/wwan/nm-modem-ofono.h  |   2 +
+ 3 files changed, 145 insertions(+), 54 deletions(-)
+
+diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
+index 3bbd170..22009f8 100644
+--- a/src/devices/wwan/nm-device-modem.c
++++ b/src/devices/wwan/nm-device-modem.c
+@@ -286,12 +286,10 @@ modem_state_cb (NMModem *modem,
+ 	if (new_state < NM_MODEM_STATE_CONNECTING &&
+ 	    old_state >= NM_MODEM_STATE_CONNECTING &&
+ 	    dev_state >= NM_DEVICE_STATE_NEED_AUTH &&
+-	    dev_state <= NM_DEVICE_STATE_ACTIVATED) {
++	    dev_state <= NM_DEVICE_STATE_ACTIVATED)
+ 		/* Fail the device if the modem disconnects unexpectedly while the
+ 		 * device is activating/activated. */
+ 		nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER);
+-		return;
+-	}
+ 
+ 	if (new_state > NM_MODEM_STATE_LOCKED && old_state == NM_MODEM_STATE_LOCKED) {
+ 		/* If the modem is now unlocked, enable/disable it according to the
+diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/devices/wwan/nm-modem-ofono.c
+index 4566be0..c09cfd5 100644
+--- a/src/devices/wwan/nm-modem-ofono.c
++++ b/src/devices/wwan/nm-modem-ofono.c
+@@ -789,42 +789,35 @@ stage1_prepare_done (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data
+ 	g_dbus_proxy_call_finish (proxy, result, &error);
+ 
+ 	if (error) {
+-		nm_log_warn (LOGD_MB, "ofono: connection failed: (%d) %s",
+-		             error ? error->code : -1,
+-		             error && error->message ? error->message : "(unknown)");
++		if (!g_strstr_len (error->message, NM_STRLEN (OFONO_ERROR_IN_PROGRESS), OFONO_ERROR_IN_PROGRESS)) {
++			nm_log_warn (LOGD_MB, "ofono: connection failed: (%d) %s",
++						 error ? error->code : -1,
++						 error && error->message ? error->message : "(unknown)");
+ 
+-		g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE,
+-		                       NM_DEVICE_STATE_REASON_MODEM_BUSY);
+-		/*
+-		 * FIXME: add code to check for InProgress so that the
+-		 * connection doesn't continue to try and activate,
+-		 * leading to the connection being disabled, and a 5m
+-		 * timeout...
+-		 */
++			g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE,
++								   NM_DEVICE_STATE_REASON_MODEM_BUSY);
++		} else
++			nm_log_warn (LOGD_MB, "ofono: connection activation returned Error.InProgress");
+ 
+ 		g_clear_error (&error);
+ 	}
+ }
+ 
+ static void
+-context_property_changed (GDBusProxy *proxy,
+-						  const char *property,
+-						  GVariant *v,
+-						  gpointer user_data)
++handle_settings (GVariant *v_dict, gpointer user_data)
+ {
+ 	NMModemOfono *self = NM_MODEM_OFONO (user_data);
+ 	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
+ 	NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE;
+ 	NMPlatformIP4Address addr;
+ 	gboolean ret = FALSE;
+-	GVariant *v_dict;
+ 	GVariantIter i;
+ 	const gchar *s, *addr_s;
+ 	const gchar **array, **iter;
+ 	guint32 address_network, gateway_network;
+ 	guint prefix = 0;
+ 
+-	nm_log_dbg (LOGD_MB, "PropertyChanged: %s", property);
++	nm_log_info (LOGD_MB, "ofono: (%s): IPv4 static Settings:", nm_modem_get_uid (NM_MODEM (self)));
+ 
+ 	/*
+ 	 * TODO: might be a good idea and re-factor this to mimic bluez-device,
+@@ -832,18 +825,6 @@ context_property_changed (GDBusProxy *proxy,
+ 	 * handle the action.
+ 	 */
+ 
+-	if (g_strcmp0 (property, "Settings") != 0)
+-		return;
+-
+-	v_dict = g_variant_get_child_value (v, 0);
+-	if (!v_dict) {
+-		nm_log_warn (LOGD_MB, "ofono: (%s): error getting IPv4 Settings",
+-					 nm_modem_get_uid (NM_MODEM (self)));
+-		goto out;
+-	}
+-
+-	nm_log_info (LOGD_MB, "ofono: (%s): IPv4 static Settings:", nm_modem_get_uid (NM_MODEM (self)));
+-
+ 	if (g_variant_lookup (v_dict, "Interface", "&s", &s)) {
+ 
+ 		nm_log_dbg (LOGD_MB, "(%s): Interface: %s", nm_modem_get_uid (NM_MODEM (self)), s);
+@@ -930,8 +911,7 @@ context_property_changed (GDBusProxy *proxy,
+ 	}
+ 
+ 	nm_log_info (LOGD_MB, "ofono (%s) Address: %s/%d",
+-				 nm_modem_get_uid (NM_MODEM (self)), addr_s, prefix);
+-
++	             nm_modem_get_uid (NM_MODEM (self)), addr_s, prefix);
+ 	nm_ip4_config_add_address (priv->ip4_config, &addr);
+ 
+ 	if (g_variant_lookup (v_dict, "Gateway", "&s", &s)) {
+@@ -972,7 +952,7 @@ context_property_changed (GDBusProxy *proxy,
+ 
+ 		if (iter == array) {
+ 			nm_log_warn (LOGD_MB, "ofono: (%s): Settings: 'DomainNameServers': none specified",
+-						 nm_modem_get_uid (NM_MODEM (self)));
++			             nm_modem_get_uid (NM_MODEM (self)));
+ 			g_free (array);
+ 			goto out;
+ 		}
+@@ -1009,7 +989,7 @@ context_property_changed (GDBusProxy *proxy,
+ out:
+ 	if (nm_modem_get_state (NM_MODEM (self)) != NM_MODEM_STATE_CONNECTED) {
+ 		nm_log_info (LOGD_MB, "ofono: (%s): emitting PREPARE_RESULT: %s",
+-					 nm_modem_get_uid (NM_MODEM (self)), ret ? "TRUE" : "FALSE");
++		             nm_modem_get_uid (NM_MODEM (self)), ret ? "TRUE" : "FALSE");
+ 
+ 		if (!ret)
+ 			reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
+@@ -1022,6 +1002,33 @@ out:
+ 	}
+ }
+ 
++static void
++context_property_changed (GDBusProxy *proxy,
++						  const char *property,
++						  GVariant *v,
++						  gpointer user_data)
++{
++	NMModemOfono *self = NM_MODEM_OFONO (user_data);
++	GVariant *v_dict;
++
++	nm_log_dbg (LOGD_MB, "PropertyChanged: %s", property);
++
++	if (g_strcmp0 (property, "Settings") != 0)
++		return;
++
++	v_dict = g_variant_get_child_value (v, 0);
++	if (!v_dict) {
++		nm_log_warn (LOGD_MB, "ofono: (%s): error getting IPv4 Settings",
++					 nm_modem_get_uid (NM_MODEM (self)));
++		return;
++	}
++
++	g_assert (g_variant_is_of_type (v_dict, G_VARIANT_TYPE_VARDICT));
++
++	handle_settings (v_dict, user_data);
++	g_variant_unref (v_dict);
++}
++
+ static NMActStageReturn
+ static_stage3_ip4_config_start (NMModem *_self,
+ 								NMActRequest *req,
+@@ -1053,11 +1060,100 @@ static_stage3_ip4_config_start (NMModem *_self,
+ }
+ 
+ static void
++context_properties_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data)
++{
++	NMModemOfono *self = NM_MODEM_OFONO (user_data);
++	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
++	GError *error = NULL;
++	GVariant *properties, *settings;
++	GVariant *v_dict = NULL;
++	gboolean active;
++
++	nm_log_dbg (LOGD_MB, "in %s", __func__);
++
++	properties = g_dbus_proxy_call_finish (proxy, result, &error);
++
++	if (error) {
++		nm_log_warn (LOGD_MB, "ofono: connection failed; couldn't read context properties (%d) %s",
++					 error ? error->code : -1,
++					 error && error->message ? error->message : "(unknown)");
++
++		g_clear_error (&error);
++		goto error;
++	}
++
++	if (properties == NULL) {
++		nm_log_warn (LOGD_MB, "ofono: connection failed; no context properties returned");
++		goto error;
++	}
++
++	v_dict = g_variant_get_child_value (properties, 0);
++	g_assert (v_dict);
++	g_assert (g_variant_is_of_type (v_dict, G_VARIANT_TYPE_VARDICT));
++
++	g_variant_unref (properties);
++
++	if (!g_variant_lookup (v_dict, "Active", "b", &active)) {
++		nm_log_warn (LOGD_MB, "ofono: connection failed; can't read 'Active' property");
++		goto error;
++	}
++
++	/* Watch for custom ofono PropertyChanged signals */
++	_nm_dbus_signal_connect (priv->context_proxy,
++							 "PropertyChanged",
++							 G_VARIANT_TYPE ("(sv)"),
++							 G_CALLBACK (context_property_changed),
++							 self);
++
++	if (active) {
++		nm_log_dbg (LOGD_MB, "connection is already Active");
++
++		settings = g_variant_lookup_value (v_dict, "Settings", G_VARIANT_TYPE_VARDICT);
++		if (settings == NULL) {
++			nm_log_warn (LOGD_MB, "ofono: connection failed; can't read 'Settings' property");
++			goto error;
++		}
++
++		handle_settings (settings, user_data);
++		g_variant_unref (settings);
++
++	} else
++		g_dbus_proxy_call (priv->context_proxy,
++						"SetProperty",
++						g_variant_new ("(sv)",
++									"Active",
++									g_variant_new ("b", TRUE)),
++						G_DBUS_CALL_FLAGS_NONE,
++						20000,
++						NULL,
++						(GAsyncReadyCallback) stage1_prepare_done,
++						g_object_ref (self));
++
++	g_variant_unref (v_dict);
++
++	return;
++
++error:
++	if (properties)
++		g_variant_unref (properties);
++
++	if (v_dict)
++		g_variant_unref (v_dict);
++
++	g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE,
++						NM_DEVICE_STATE_REASON_MODEM_BUSY);
++}
++
++static void
+ context_proxy_new_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data)
+ {
+ 	NMModemOfono *self = NM_MODEM_OFONO (user_data);
+ 	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
++	gboolean context_active;
+ 	GError *error = NULL;
++	GVariant *v_dict;
++	GVariant *active_property;
++	GVariant *settings_property;
+ 
+ 	nm_log_dbg (LOGD_MB, "%s:", __func__);
+ 
+@@ -1087,23 +1183,18 @@ context_proxy_new_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_dat
+ 	if (priv->ip4_config)
+ 		g_clear_object (&priv->ip4_config);
+ 
+-	/* Watch for custom ofono PropertyChanged signals */
+-	_nm_dbus_signal_connect (priv->context_proxy,
+-							 "PropertyChanged",
+-							 G_VARIANT_TYPE ("(sv)"),
+-							 G_CALLBACK (context_property_changed),
+-							 self);
+-
++	/* As ofono doesn't properly implement DBus.Properties, we need to
++	 * query the ConnectionContextinteface directly to get the current
++	 * property values vs. using g_dbus_proxy_get_cached_property.
++	 */
+ 	g_dbus_proxy_call (priv->context_proxy,
+-					   "SetProperty",
+-					   g_variant_new ("(sv)",
+-								      "Active",
+-								      g_variant_new ("b", TRUE)),
+-					   G_DBUS_CALL_FLAGS_NONE,
+-				       20000,
+-				       NULL,
+-				       (GAsyncReadyCallback) stage1_prepare_done,
+-					   g_object_ref (self));
++					"GetProperties",
++					NULL,
++					G_DBUS_CALL_FLAGS_NONE,
++					20000,
++					NULL,
++					(GAsyncReadyCallback) context_properties_cb,
++					g_object_ref (self));
+ }
+ 
+ static void
+@@ -1112,8 +1203,8 @@ do_context_activate (NMModemOfono *self)
+ 	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
+ 	GValue value = G_VALUE_INIT;
+ 
+-	g_return_val_if_fail (self != NULL, FALSE);
+-	g_return_val_if_fail (NM_IS_MODEM_OFONO (self), FALSE);
++	g_assert (self != NULL);
++	g_assert (NM_IS_MODEM_OFONO (self));
+ 
+ 	nm_log_dbg (LOGD_MB, "in %s", __func__);
+ 
+diff --git a/src/devices/wwan/nm-modem-ofono.h b/src/devices/wwan/nm-modem-ofono.h
+index fa79e15..02eca11 100644
+--- a/src/devices/wwan/nm-modem-ofono.h
++++ b/src/devices/wwan/nm-modem-ofono.h
+@@ -41,6 +41,8 @@ G_BEGIN_DECLS
+ #define OFONO_DBUS_INTERFACE_CONNECTION_CONTEXT "org.ofono.ConnectionContext"
+ #define OFONO_DBUS_INTERFACE_SIM_MANAGER        "org.ofono.SimManager"
+ 
++#define OFONO_ERROR_IN_PROGRESS                 "org.ofono.Error.InProgress"
++
+ typedef enum {
+ 	NM_OFONO_ERROR_CONNECTION_NOT_OFONO = 0,  /*< nick=ConnectionNotOfono >*/
+ 	NM_OFONO_ERROR_CONNECTION_INVALID,      /*< nick=ConnectionInvalid >*/