[Merge] lp:~phablet-team/network-manager/lp1461593-wily into lp:~network-manager/network-manager/ubuntu

[Tony Espy]

Tony Espy has proposed merging lp:~phablet-team/network-manager/lp1461593-wily into lp:~network-manager/network-manager/ubuntu with lp:~phablet-team/network-manager/lp1435776-wily as a prerequisite.

Requested reviews:
  Network-manager (network-manager)
Related bugs:
  Bug #1461593 in network-manager (Ubuntu): "No data connection switching from 2G only to 3G"
  https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1461593

For more details, see:
https://code.launchpad.net/~phablet-team/network-manager/lp1461593-wily/+merge/264894

This change adds a 5s delay into NM_POLICY's re-connect logic, specifically so that the retry_limit of the associated connection isn't exhausted immediately whenever the connection drops, which then used to result in a 5m timer being set.

There are two changes...

1. The afore-mentioned 5m timer is now reduced to 30s for modem devices. In theory, connections shouldn't be getting disabled anymore due to the above fix, so this is a just-in-case change.

2. The low-level NM_MODEM_OFONO code wasn't setting the modem state to DISCONNECTING when disconnect() was called. This is now done, and in the associated callback ( disconnect_cb ) the new state is now determined by the ofono cached properties ( online && powered && attached ).

-- 
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/network-manager/lp1435776-wily.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 11502 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150715/f9ca21a2/attachment.diff>