Merge lp://staging/~thomas-voss/location-service/fwd-merge into lp://staging/location-service/trunk
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~thomas-voss/location-service/fwd-merge |
| Merge into: | lp://staging/location-service/trunk |
| Diff against target: |
2784 lines (+1908/-192) 48 files modified
CMakeLists.txt (+14/-0) _clang-format (+56/-0) astyle-config (+43/-0) debian/changelog (+91/-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 (+23/-14) 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) |
| To merge this branch: | bzr merge lp://staging/~thomas-voss/location-service/fwd-merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
[ Alberto Mardegan ]
* Set debian source format to "3.0 (native)"
[ Scott Sweeny ]
* Allow providers to register themselves asynchronously (LP: #1415029)
* Account for changes in trust-store w.r.t. assembling the description
of a trust prompt.
* Fix settings not being applied correctly.
* Ensure that event connections are cleaned up on destruction. (LP:
#1480877)
[ Alberto Mardegan ]
* Send last known position on session start
[ CI Train Bot ]
* New rebuild forced.
[ Thomas Voß ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
pair of files. Add test cases around correct operation of
service::Runtime. added:
src/location_
src/location_
tests/
[ thomas-voss ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
pair of files. Add test cases around correct operation of
service::Runtime. added:
src/location_
src/location_
tests/
* Adjust default timeout for downloading GPS XTRA data.
[ Alberto Mardegan ]
* Make sure that injected time is given in milliseconds
[ Thomas Voß ]
* Cherry-pick rev. 196 and 199 from lp:location-service. The changes
got accidentally removed by merging the outstanding documentation
branch.
* Handle responses of clients to updates asynchronously. Rely on
dummy:
#1462664, #1387643)
[ Thomas Voß ]
* Add documentation for debugging, hacking and debugging the location
service. Pull manual testing instructions over from the wiki. Add
tools for formatting the source.
[ thomas-voss ]
* Add documentation for debugging, hacking and debugging the location
service. Pull manual testing instructions over from the wiki. Add
tools for formatting the source.
Description of the change
[ Alberto Mardegan ]
* Set debian source format to "3.0 (native)"
[ Scott Sweeny ]
* Allow providers to register themselves asynchronously (LP: #1415029)
* Account for changes in trust-store w.r.t. assembling the description
of a trust prompt.
* Fix settings not being applied correctly.
* Ensure that event connections are cleaned up on destruction. (LP:
#1480877)
[ Alberto Mardegan ]
* Send last known position on session start
[ CI Train Bot ]
* New rebuild forced.
[ Thomas Voß ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
pair of files. Add test cases around correct operation of
service::Runtime. added:
src/location_
src/location_
tests/
[ thomas-voss ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
pair of files. Add test cases around correct operation of
service::Runtime. added:
src/location_
src/location_
tests/
* Adjust default timeout for downloading GPS XTRA data.
[ Alberto Mardegan ]
* Make sure that injected time is given in milliseconds
[ Thomas Voß ]
* Cherry-pick rev. 196 and 199 from lp:location-service. The changes
got accidentally removed by merging the outstanding documentation
branch.
* Handle responses of clients to updates asynchronously. Rely on
dummy:
#1462664, #1387643)
[ Thomas Voß ]
* Add documentation for debugging, hacking and debugging the location
service. Pull manual testing instructions over from the wiki. Add
tools for formatting the source.
[ thomas-voss ]
* Add documentation for debugging, hacking and debugging the location
service. Pull manual testing instructions over from the wiki. Add
tools for formatting the source.
| PS Jenkins bot (ps-jenkins) wrote | # |
Unmerged revisions
- 219. By Thomas Voß
-
[ Alberto Mardegan ]
* Set debian source format to "3.0 (native)"
[ Scott Sweeny ]
* Allow providers to register themselves asynchronously (LP: #1415029)
* Account for changes in trust-store w.r.t. assembling the description
of a trust prompt.
* Fix settings not being applied correctly.
* Ensure that event connections are cleaned up on destruction. (LP:
#1480877)
[ Alberto Mardegan ]
* Send last known position on session start
[ CI Train Bot ]
* New rebuild forced.
[ Thomas Voß ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
pair of files. Add test cases around correct operation of
service::Runtime. added:
src/location_service/ com/ubuntu/ location/ service/ runtime. cpp
src/location_service/ com/ubuntu/ location/ service/ runtime. h
tests/runtime_ test.cpp
[ thomas-voss ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
pair of files. Add test cases around correct operation of
service::Runtime. added:
src/location_service/ com/ubuntu/ location/ service/ runtime. cpp
src/location_service/ com/ubuntu/ location/ service/ runtime. h
tests/runtime_ test.cpp
* Adjust default timeout for downloading GPS XTRA data.
[ Alberto Mardegan ]
* Make sure that injected time is given in milliseconds
[ Thomas Voß ]
* Cherry-pick rev. 196 and 199 from lp:location-service. The changes
got accidentally removed by merging the outstanding documentation
branch.
* Handle responses of clients to updates asynchronously. Rely on
dummy::ConnectivityMa nager as harvesting is disabled anyway. (LP:
#1462664, #1387643)
[ Thomas Voß ]
* Add documentation for debugging, hacking and debugging the location
service. Pull manual testing instructions over from the wiki. Add
tools for formatting the source.
[ thomas-voss ]
* Add documentation for debugging, hacking and debugging the location
service. Pull manual testing instructions over from the wiki. Add
tools for formatting the source.
PASSED: Continuous integration, rev:219
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://