Merge lp://staging/~thomas-voss/location-service/do-not-rely-on-obsolete-satellite-based-positioning-state into lp://staging/location-service/trunk
Proposed by
Thomas Voß
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~thomas-voss/location-service/do-not-rely-on-obsolete-satellite-based-positioning-state |
| Merge into: | lp://staging/location-service/trunk |
| Diff against target: |
2828 lines (+1913/-206) (has conflicts) 48 files modified
CMakeLists.txt (+14/-0) _clang-format (+56/-0) astyle-config (+43/-0) debian/changelog (+94/-0) debian/source/format (+1/-1) 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) examples/service/service.cpp (+14/-15) include/location_service/com/ubuntu/location/provider_factory.h (+3/-0) po/ubuntu-location-service.pot (+7/-11) 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 (+1/-1) src/location_service/com/ubuntu/location/engine.cpp (+25/-28) src/location_service/com/ubuntu/location/engine.h (+3/-3) src/location_service/com/ubuntu/location/provider_factory.cpp (+14/-0) src/location_service/com/ubuntu/location/providers/config.cpp (+7/-0) src/location_service/com/ubuntu/location/providers/dummy/CMakeLists.txt (+3/-1) src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.cpp (+42/-0) src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.h (+62/-0) 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/providers/remote/provider.cpp (+23/-0) src/location_service/com/ubuntu/location/service/daemon.cpp (+27/-82) 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/service/trust_store_permission_manager.cpp (+1/-1) src/location_service/com/ubuntu/location/time_based_update_policy.cpp (+4/-3) tests/CMakeLists.txt (+2/-0) tests/acceptance_tests.cpp (+114/-12) tests/delayed_service_test.cpp (+193/-0) tests/engine_test.cpp (+3/-3) tests/gps_provider_test.cpp (+83/-0) tests/mock_event_receiver.h (+35/-0) tests/position_test.cpp (+1/-1) tests/remote_providerd_test.cpp (+1/-7) 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/do-not-rely-on-obsolete-satellite-based-positioning-state |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-03-02.
Commit message
Remove explicit option to disable satellite-based positioning services.
The service is clever enough to dynamically enable/disable the provider, taking into account
accuracy requirements.
Description of the change
Remove explicit option to disable satellite-based positioning services.
The service is clever enough to dynamically enable/disable the provider, taking into account
accuracy requirements.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
