NetworkManager

Merge lp://staging/~phablet-team/network-manager/lp1418077 into lp://staging/~network-manager/network-manager/ubuntu

  1. lp1418077
  2. Merge into ubuntu
Proposed by Tony Espy
Status: Merged
Approved by: Ricardo Salveti
Approved revision: no longer in the source branch.
Merged at revision: 955
Proposed branch: lp://staging/~phablet-team/network-manager/lp1418077
Merge into: lp://staging/~network-manager/network-manager/ubuntu
Diff against target: 223 lines (+78/-25)
1 file modified
debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch (+78/-25)
To merge this branch: bzr merge lp://staging/~phablet-team/network-manager/lp1418077
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Ubuntu Phablet Team Pending
Review via email: mp+255285@code.staging.launchpad.net

Description of the change

This merge a fix for lp: #1418077 - NM takes ~5m to reconnect after GPRS detaches.

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

I'd much rather we semantically split any cleanup from actual bugfix, both in the interest of readability of the diff as well as to reduce the scope of changes and risk of regression.

review: Needs Fixing
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

These changes might also need to be applied to the RTM branches.

Revision history for this message
Tony Espy (awe) wrote :

AFAIK, we're not doing any more updates to the RTM branch. Also, pretty sure these diffs wouldn't apply as is...

Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Change looks good, need to test it still.

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Very wise handling of autoconnect there. Has it been discussed with upstream NM developers?

Changes look fine to me, modulo inline comments.

review: Needs Information
Revision history for this message
Tony Espy (awe) wrote :

Yes, Dan and I discussed, and we iterated over this approach till it worked.

That said, my only concern is whether or not this approach has any negative impact on the modem-manager behavior.

I've responded to the comments inline.

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

I don't know about the impact to MM. It will need to be tested as part of the silo testing.

review: Approve
lp://staging/~phablet-team/network-manager/lp1418077 updated
955. By Tony Espy

Fix ofono mobile-data 5m reconnect bug (LP: #1418077)

This change fixes a bug that occurs when the modem detaches
from GPRS due to signal loss, or a settings change (eg. radio
tech). Now when this happens, the connection's autoconnect
flag is set to FALSE. When re-attachment occurs, the flag
is set to TRUE, and autoconnect is re-triggered. A bug in
the ofono disconnect_done function was also fixed to ensure
the state is updated correctly.

956. By Tony Espy

Increase ofono activation timeout to 40s

Increase the ofono activation timeout to 40
to match the value used by connman.

Revision history for this message
Tony Espy (awe) wrote :

1. Tested on mako ( vivid-proposed #166 ):

 - device boots & mobile data connection established

 - tested bug scenario ( switch radio tech, no 5m delay )

 - tested flight-mode

 - tested switching from wifi to mobile via wifi toggle

2. Tested on krillin ( vivid-proposed #183 ):

 - device boots with SIM in slot1, mobile data connection (2g) established (2)

 - can't test device scenario ( no 3g )

 - tested flight mode (2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches