Merge lp://qastaging/~phablet-team/network-manager/lp1361864-2 into lp://qastaging/~phablet-team/network-manager/vivid-phone-overlay
Status: | Merged |
---|---|
Approved by: | Alfonso Sanchez-Beato |
Approved revision: | 968 |
Merged at revision: | 965 |
Proposed branch: | lp://qastaging/~phablet-team/network-manager/lp1361864-2 |
Merge into: | lp://qastaging/~phablet-team/network-manager/vivid-phone-overlay |
Diff against target: |
710 lines (+665/-4) 4 files modified
debian/changelog (+18/-0) debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch (+3/-4) debian/patches/lp1361864-add-ofono-preferred-contexts.patch (+643/-0) debian/patches/series (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~phablet-team/network-manager/lp1361864-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alfonso Sanchez-Beato | Approve | ||
Review via email:
|
Description of the change
This change adds support for the new ofono gprs-context property 'Preferred'.
When a context is set to 'Preferred=true', NM should disregard all other contexts for the the same IMSI. If the a context is connected, and another context is set as 'Preferred', NM will disconnect the existing context, and attempt to activate the 'Preferred' context. If the 'Preferred' context fails, NM will not try to activate any other contexts.
When a context is set to 'Preferred=false', NM will not deactivate the context, if currently connected.
This change also removes the code in NMMOdemOfono which invoked a DBus method (ReadImsiConetexts) provided by SCPlugin-Ofono, as this only had any effect when a new context was added. and this case is already handled by the imsi_monitor.
Finally, the code in NMDeviceModem which disabled and re-enabled autoconnect based upon device and modem_state was removed, as it caused a hang on arale when a deactivate context failed, and the retry limit was hit, which causes a modem reset.
Please see comments below.