Merge lp://staging/~phablet-team/network-manager/rm-scofono-plugin-dbus-wily into lp://staging/~network-manager/network-manager/ubuntu

Proposed by Tony Espy
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 999
Merged at revision: 1000
Proposed branch: lp://staging/~phablet-team/network-manager/rm-scofono-plugin-dbus-wily
Merge into: lp://staging/~network-manager/network-manager/ubuntu
Prerequisite: lp://staging/~phablet-team/network-manager/fix-ofono-plugin-mem-leaks-wily
Diff against target: 291 lines (+6/-158)
5 files modified
debian/changelog (+3/-0)
debian/network-manager.install (+0/-1)
debian/patches/CVE-2015-1322.patch (+0/-31)
debian/patches/add_ofono_settings_support.patch (+3/-125)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp://staging/~phablet-team/network-manager/rm-scofono-plugin-dbus-wily
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+271709@code.staging.launchpad.net

Description of the change

This change drops the DBus code from the ofono settings plugin.

The only DBus method in the plugin, ReadImsiContexts, hasn't been used ever since the following vivid patch ( which has since been merged into the current add_ofono_settings.patch for wily ):

lp1361864-add-ofono-preferred-contexts.patch

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

This sounds very very wrong, even if it might not have been used (which also sounds wrong).

The purpose of this code is to read in any new connections that might have been created by ofono: there is no other way to do this except outside of the modem plugin code. I think this code in particular is important for when users create brand new connections while the system is running; otherwise they might have to restart NetworkManager (not simple from the phone).

New connection creation would require this because the connection needs to be created at the ofono level to have all the necessary data (username, proxy, etc.), and from there, detected by NM and read into a NMConnection object.

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

This code hasn't been used since we merged my changes for the gprs_context 'Preferred' attribute. When those changes were made, I removed the DBus call in the ofono modem plugin, but left the DBus code in the settings plugin in place, in case regressions were discovered.

Needless to say, there have been no regressions found, so it makes no sense to keep a DBus proxy active when it's not being used.

You reviewed and approved the change in the following merge:

https://code.launchpad.net/~phablet-team/network-manager/lp1361864-2/+merge/263982

And the associated bug:

https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1361864

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

No objections, code cleanups are always welcome if it's unnecessary cruft.

review: Approve
1000. By Tony Espy

settings: fixup SCOfonoPlugin build error

1001. By Tony Espy

debian/network-manager.install: remove nm-ofono.conf

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