Merge lp:~thomas-voss/location-service/less-conservative-about-connection-characteristics into lp:location-service/15.04

Proposed by Thomas Voß on 2015-12-11
Status: Needs review
Proposed branch: lp:~thomas-voss/location-service/less-conservative-about-connection-characteristics
Merge into: lp:location-service/15.04
Diff against target: 14 lines (+1/-3)
1 file modified
src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp (+1/-3)
To merge this branch: bzr merge lp:~thomas-voss/location-service/less-conservative-about-connection-characteristics
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2015-12-11 Pending
Review via email: mp+280326@code.launchpad.net

This proposal supersedes a proposal from 2015-12-11.

Commit message

Be less conservative when determining connection characteristics.

Description of the change

Be less conservative when determining connection characteristics.

To post a comment you must log in.

Unmerged revisions

211. By Thomas Voß on 2015-12-11

Be less conservative when determining connection characteristics.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp'
2--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp 2015-12-02 12:00:25 +0000
3+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp 2015-12-11 16:17:22 +0000
4@@ -682,9 +682,7 @@
5 // connections unless we could unambigiously determine that we are *not* roaming.
6 characteristics = characteristics | connectivity::Characteristics::connection_is_roaming;
7 }
8- }
9-
10- characteristics = characteristics | all_characteristics();
11+ }
12 } else if (type == xdg::NetworkManager::Device::Type::wifi)
13 {
14 characteristics = characteristics | connectivity::Characteristics::connection_goes_via_wifi;

Subscribers

People subscribed via source and target branches