Merge lp://staging/~thomas-voss/location-service/less-conservative-about-connection-characteristics into lp://staging/location-service/trunk
Proposed by
Thomas Voß
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~thomas-voss/location-service/less-conservative-about-connection-characteristics |
Merge into: | lp://staging/location-service/trunk |
Diff against target: |
2131 lines (+1475/-143) (has conflicts) 34 files modified
CMakeLists.txt (+14/-0) _clang-format (+56/-0) astyle-config (+43/-0) debian/changelog (+77/-0) doc/Doxyfile.in (+2/-2) doc/daemon_and_cli.md (+55/-0) doc/debugging.md (+92/-0) doc/hacking.md (+146/-0) doc/intro.md (+67/-0) doc/manual_testing.md (+174/-0) doc/tips_n_tricks.md (+21/-0) src/location_service/com/ubuntu/location/CMakeLists.txt (+1/-0) src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp (+12/-6) src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h (+12/-0) src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp (+2/-4) src/location_service/com/ubuntu/location/engine.cpp (+23/-14) src/location_service/com/ubuntu/location/engine.h (+3/-3) src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp (+3/-5) src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h (+1/-1) src/location_service/com/ubuntu/location/service/daemon.cpp (+14/-66) src/location_service/com/ubuntu/location/service/implementation.cpp (+25/-4) src/location_service/com/ubuntu/location/service/provider_daemon.cpp (+17/-16) src/location_service/com/ubuntu/location/service/runtime.cpp (+109/-0) src/location_service/com/ubuntu/location/service/runtime.h (+90/-0) src/location_service/com/ubuntu/location/service/session/skeleton.cpp (+21/-3) src/location_service/com/ubuntu/location/time_based_update_policy.cpp (+4/-3) tests/CMakeLists.txt (+1/-0) tests/acceptance_tests.cpp (+114/-12) tests/engine_test.cpp (+3/-3) tests/gps_provider_test.cpp (+83/-0) tests/position_test.cpp (+1/-1) tests/runtime_test.cpp (+118/-0) tools/CMakeLists.txt (+1/-0) tools/symbol_diff.in (+70/-0) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp://staging/~thomas-voss/location-service/less-conservative-about-connection-characteristics |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phablet Team | Pending | ||
Review via email: mp+280325@code.staging.launchpad.net |
This proposal has been superseded by 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ß
-
Be less conservative when determining connection characteristics.