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

[Thomas Voß]

Be less conservative when determining connection characteristics.

Be less conservative when determining connection characteristics.

Unmerged revisions

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

Be less conservative when determining connection characteristics.

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-12-02 12:00:25 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-12-11 16:17:22 +0000
@@ -682,9 +682,7 @@
                         // connections unless we could unambigiously determine that we are *not* roaming.
                         characteristics = characteristics | connectivity::Characteristics::connection_is_roaming;
                     }
-                }
-
-                characteristics = characteristics | all_characteristics();                
+                }                
             } else if (type == xdg::NetworkManager::Device::Type::wifi)
             {
                 characteristics = characteristics | connectivity::Characteristics::connection_goes_via_wifi;