lp:~mandel/location-service/remove-cotroller

Branch merges

Ready for review for merging into lp:location-service/trunk

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-05-28

Thomas Voß (community): Needs Fixing on 2015-04-28

Jim Hodapp (community): Approve (code) on 2015-04-27

Diff: 1999 lines (+784/-681)

21 files modified

data/ubuntu-location-service-trust-stored.conf.in (+4/-2)
include/location_service/com/ubuntu/location/provider.h (+102/-119)
src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp (+9/-2)
src/location_service/com/ubuntu/location/default_provider_selection_policy.cpp (+3/-3)
src/location_service/com/ubuntu/location/engine.cpp (+112/-59)
src/location_service/com/ubuntu/location/engine.h (+12/-0)
src/location_service/com/ubuntu/location/non_selecting_provider_selection_policy.cpp (+34/-34)
src/location_service/com/ubuntu/location/provider.cpp (+129/-122)
src/location_service/com/ubuntu/location/providers/geoclue/provider.cpp (+6/-6)
src/location_service/com/ubuntu/location/providers/geoclue/provider.h (+8/-8)
src/location_service/com/ubuntu/location/providers/remote/provider.cpp (+34/-34)
src/location_service/com/ubuntu/location/providers/remote/provider.h (+16/-16)
src/location_service/com/ubuntu/location/proxy_provider.cpp (+6/-6)
src/location_service/com/ubuntu/location/service/session/implementation.cpp (+6/-6)
tests/CMakeLists.txt (+0/-1)
tests/controller_test.cpp (+0/-132)
tests/engine_test.cpp (+126/-0)
tests/mock_provider.h (+8/-8)
tests/provider_selection_policy_test.cpp (+28/-28)
tests/provider_test.cpp (+129/-83)
tests/remote_provider_test.cpp (+12/-12)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

206. By Manuel de la Peña on 2015-05-28

Remove the call to the state controller.

205. By Manuel de la Peña on 2015-05-26

Merged long-running-stop into remove-cotroller.

204. By Manuel de la Peña on 2015-05-04

Fix merge issues.

203. By Manuel de la Peña on 2015-05-04

Merged long-running-stop into remove-cotroller.

202. By Manuel de la Peña on 2015-04-29

Merged trust-store-fixes into remove-cotroller.

201. By Manuel de la Peña on 2015-04-29

Merged trust-store-fixes into remove-cotroller.

200. By Manuel de la Peña on 2015-04-29

Merged trust-store-fixes into remove-cotroller.

199. By Manuel de la Peña on 2015-04-28

Merged trust-store-fixes into remove-cotroller.

198. By Manuel de la Peña on 2015-04-27

Move provider header since it is public and used by espoo.

197. By Manuel de la Peña on 2015-04-27

Merged tvoss-time-delta-fixes into remove-cotroller.