Merge lp:~robru/location-service/pre_release_hook into lp:location-service/trunk

[Robert Bruce Park]

Use new bileto_pre_release_hook.

[lp:~robru/location-service/pre_release_hook]

231. By Robert Bruce Park on 2016-04-05

Simplify symlinks.

232. By Robert Bruce Park on 2016-04-12

Fix ln.

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-18 23:06:08 +0000
+++ CMakeLists.txt	2016-04-05 17:17:30 +0000
@@ -2,9 +2,34 @@
 
 project(ubuntu-location-service)
 
-set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 2)
-set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
-set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
+# We haven't received version information via the packaging setup.
+# For that, we try to determine sensible values on our own, ensuring
+# plain old invocations to cmake still work as expected.
+if (NOT DEFINED UBUNTU_LOCATION_SERVICE_VERSION_MAJOR)
+  find_program(LSB_RELEASE lsb_release)
+  execute_process(
+    COMMAND ${LSB_RELEASE} -c -s
+    OUTPUT_VARIABLE DISTRO_CODENAME
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # We explicitly ignore errors and only check if we are building for vivid.
+  # For all other cases:
+  #   - releases other than vivid
+  #   - other distros
+  #   - errors
+  # we define the version to be 2.0.0
+  if (${DISTRO_CODENAME} STREQUAL "vivid")
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 2)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
+  else ()
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 3)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
+  endif()
+endif()
+
+message(STATUS "${CMAKE_PROJECT_NAME} ${UBUNTU_LOCATION_SERVICE_VERSION_MAJOR}.${UBUNTU_LOCATION_SERVICE_VERSION_MINOR}.${UBUNTU_LOCATION_SERVICE_VERSION_PATCH}")
 
 set(UBUNTU_LOCATION_SERVICE_TRUST_STORE_SERVICE_NAME "UbuntuLocationService")
 
@@ -54,6 +79,20 @@
     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-local-typedefs")
 endif (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
 
+#
+# Code style fixer. We rely on clang-format to adjust the formatting of source code.
+#
+find_program(CLANG_FORMAT_COMMAND NAMES clang-format-3.6 clang-format-3.5)
+if (NOT CLANG_FORMAT_COMMAND)
+  message(WARNING "Cannot find clang-format >= clang-format-3.5: formatcode target will not be available")
+endif()
+
+if (CLANG_FORMAT_COMMAND)
+  file(GLOB_RECURSE UBUNTU_LOCATION_SERVICE_INTERFACE_HEADER_FILES ${CMAKE_SOURCE_DIR}/include/*.h)
+  file(GLOB_RECURSE UBUNTU_LOCATION_SERVICE_IMPLEMENTATION_FILES ${CMAKE_SOURCE_DIR}/src/*.h ${CMAKE_SOURCE_DIR}/src/*.cpp)
+  add_custom_target(formatcode ${CLANG_FORMAT_COMMAND} -i ${UBUNTU_LOCATION_SERVICE_INTERFACE_HEADER_FILES} ${UBUNTU_LOCATION_SERVICE_IMPLEMENTATION_FILES} SOURCES _clang-format)
+endif()
+
 include_directories(
   ${Boost_INCLUDE_DIRS}
   ${DBUS_INCLUDE_DIRS}
 
=== added file '_clang-format'
--- _clang-format	1970-01-01 00:00:00 +0000
+++ _clang-format	2016-04-05 17:17:30 +0000
@@ -0,0 +1,56 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+ConstructorInitializerIndentWidth: 4
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AlwaysBreakTemplateDeclarations: false
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: true
+ColumnLimit: 0
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+DerivePointerAlignment: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: false
+IndentWrappedFunctionNames: false
+IndentFunctionDeclarationAfterType: false
+MaxEmptyLinesToKeep: 1
+KeepEmptyLinesAtTheStartOfBlocks: true
+NamespaceIndentation: None
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: true
+Standard:        Cpp11
+IndentWidth:     4
+TabWidth:        8
+UseTab:          Never
+BreakBeforeBraces: Allman
+SpacesInParentheses: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 4
+CommentPragmas:  '^ IWYU pragma:'
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
+DisableFormat:   false
+...
+
 
=== added file 'astyle-config'
--- astyle-config	1970-01-01 00:00:00 +0000
+++ astyle-config	2016-04-05 17:17:30 +0000
@@ -0,0 +1,43 @@
+# Options for formatting code with astyle.
+#
+# This helps to make code match the style guide.
+# 
+# Use like this:
+# 
+#     astyle --options=astyle-config mfile.h myfile.cpp
+# 
+# Occasionally, astyle does something silly (particularly with lambdas), so it's
+# still necessary to scan the changes for things that are wrong.
+# But, for most files, it does a good job.
+# 
+# Please consider using this before checking code in for review. Code reviews shouldn't
+# have to deal with layout issues, they are just a distraction. It's better to be able
+# to focus on semantics in a code review, with style issues out of the way.
+
+--formatted
+--style=allman
+--min-conditional-indent=2
+--indent-switches
+--max-instatement-indent=120
+--pad-header
+--align-pointer=type
+--align-reference=type
+--convert-tabs
+--close-templates
+--max-code-length=120
+
+# --pad-oper
+#
+# Commented out for now. It changes
+#
+#     for (int i=0; i<10; ++i)
+# to
+#     for (int i = 0; i < 10; ++i)
+#
+# Unfortunately, it also messes with rvalue references:
+#
+#     ResourcePtr& operator=(ResourcePtr&& r);
+#
+# becomes:
+#
+#     ResourcePtr& operator=(ResourcePtr && r);
 
=== added file 'debian/VERSION'
--- debian/VERSION	1970-01-01 00:00:00 +0000
+++ debian/VERSION	2016-04-05 17:17:30 +0000
@@ -0,0 +1,1 @@
+3.0.0
 \ No newline at end of file
 
=== added file 'debian/VERSION.vivid'
--- debian/VERSION.vivid	1970-01-01 00:00:00 +0000
+++ debian/VERSION.vivid	2016-04-05 17:17:30 +0000
@@ -0,0 +1,1 @@
+2.0.0
 
=== added file 'debian/bileto_pre_release_hook'
--- debian/bileto_pre_release_hook	1970-01-01 00:00:00 +0000
+++ debian/bileto_pre_release_hook	2016-04-05 17:17:30 +0000
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Michi Henning <[e-mail]>
+#              Thomas Voß <[e-mail]>
+#              Robert Bruce Park <[e-mail]>
+
+#
+# Script to generate debian files for dual landing in Vivid (gcc 4.9 ABI)
+# and Wily and later (gcc 5 ABI).
+#
+# This script is called from debian/rules and generates:
+#
+# - control
+# - libubuntu-location-service${soversion}.install.${target_arch}
+#
+# For all but control, this is a straight substition and/or renaming exercise for each file.
+#
+
+set -e  # Fail if any command fails.
+
+progname=$(basename $0)
+
+[ $# -gt 1 ] && {
+    echo "usage: $progname [path-to-debian-dir]" >&2
+    exit 1
+}
+dir=$1
+version_dir=$(mktemp -d)
+
+[ -n "$dir" ] || dir="./debian"
+[ -n "$SERIES" ] || SERIES="$(lsb_release -c -s)"
+
+# Dump version numbers into files and initialize vars from those files.
+sh ${dir}/get-versions.sh ${dir} ${version_dir}
+
+export UBUNTU_LOCATION_SERVICE_SOVERSION=$(cat $version_dir/libubuntu-location-service.soversion)
+
+trap "rm -fr $version_dir" 0 INT TERM QUIT
+
+process()
+{
+    cat <<EOF
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to $(basename "$1") instead.
+# This file is regenerated automatically in the clean target.
+#
+EOF
+    perl -pe 's/@([A-Z_]+)@/$ENV{$1} or die "$1 undefined"/eg' <"$1"
+}
+
+process "$dir/control.in" >"$dir/control"
+process "$dir/libubuntu-location-service.install.in" >"$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install"
+process "$dir/libubuntu-location-service.install.with-gps.in" >"$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps"
+process "$dir/libubuntu-location-service-dev.install.in" >"$dir/libubuntu-location-service-dev.install"
+
+ln -s "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.amd64"
+ln -s "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.armhf"
+ln -s "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.i386"
+
+exit 0
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-07-27 18:07:37 +0000
+++ debian/changelog	2016-04-05 17:17:30 +0000
@@ -1,40 +1,135 @@
-location-service (2.1+15.10.20150727-0ubuntu1) wily; urgency=medium
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Charles Kerr ]
-  * drop build-dependency on g++-4.9 (LP: #1452329)
-
- -- CI Train Bot <[e-mail]>  Mon, 27 Jul 2015 18:07:37 +0000
-
-location-service (2.1+15.10.20150706-0ubuntu1) wily; urgency=medium
-
-  [ Alberto Aguirre ]
-  * No change rebuild against platform-api 3
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
- -- CI Train Bot <[e-mail]>  Mon, 06 Jul 2015 18:22:22 +0000
-
-location-service (2.1+15.10.20150601.2-0ubuntu1) wily; urgency=medium
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Manuel de la Pena ]
-  * Ensure that the trust store is started when is needed.
-
- -- CI Train Bot <[e-mail]>  Mon, 01 Jun 2015 15:13:06 +0000
-
-location-service (2.1+15.10.20150528.3-0ubuntu1) wily; urgency=medium
-
-  [ Thomas Voß ]
-  * Make sure we always hand a lock owning its mutex to
-    on_access_point_added. (LP: #1426307)
-
- -- CI Train Bot <[e-mail]>  Thu, 28 May 2015 11:40:58 +0000
+location-service (3.0.0-0ubuntu5) UNRELEASED; urgency=medium
+
+  * Enable dual landings according to https://wiki.ubuntu.com/citrain/LandingProcess#Dual-landing_for_stable_and_devel:
+    * Both vivid+overlay and xenial packages are built from the same
+      source.
+    * To account for differences in major revisions (necessary to handle
+      the g++ 5 ABI break), we generate install files on the fly.
+
+ -- Thomas Voß <[e-mail]>  Wed, 16 Mar 2016 20:15:57 +0100
+
+location-service (3.0.0-0ubuntu4) wily-proposed; urgency=medium
+
+  * No change rebuild.
+
+ -- Ken VanDine <[e-mail]>  Mon, 03 Aug 2015 13:33:13 -0400
+
+location-service (3.0.0-0ubuntu3) wily; urgency=medium
+
+  * No change rebuild.
+
+ -- Matthias Klose <[e-mail]>  Fri, 31 Jul 2015 00:23:18 +0200
+
+location-service (3.0.0-0ubuntu2) wily; urgency=medium
+
+  * libubuntu-location-service3: Replaces libubuntu-location-service2,
+    config file /etc/gps.conf in both packages.
+
+ -- Matthias Klose <[e-mail]>  Thu, 30 Jul 2015 09:57:50 +0200
+
+location-service (3.0.0) wily; urgency=medium
+
+  * Bump major revision and fix LP:#1478750 to account for toolchain update.
+
+ -- Thomas Voß <[e-mail]>  Thu, 30 Jul 2015 08:33:13 +0200
+
+location-service (2.1+15.04.20160302.1-0ubuntu1) vivid; urgency=medium
+
+  * Remove explicit option to disable satellite-based positioning
+    services.
+
+ -- Thomas Voß <[e-mail]>  Wed, 02 Mar 2016 15:28:02 +0000
+
+location-service (2.1+15.04.20160106-0ubuntu1) vivid; urgency=medium
+
+  [ Alberto Mardegan ]
+  * Set debian source format to "3.0 (native)"
+
+  [ Scott Sweeny ]
+  * Allow providers to register themselves asynchronously (LP: #1415029)
+
+ -- Thomas Voß <[e-mail]>  Wed, 06 Jan 2016 16:15:29 +0000
+
+location-service (2.1+15.04.20151211-0ubuntu1) vivid; urgency=medium
+
+  * Account for changes in trust-store w.r.t. assembling the description
+    of a trust prompt.
+
+ -- Thomas Voß <[e-mail]>  Fri, 11 Dec 2015 08:57:44 +0000
+
+location-service (2.1+15.04.20151209-0ubuntu1) vivid; urgency=medium
+
+  * Fix settings not being applied correctly.
+
+ -- Thomas Voß <[e-mail]>  Wed, 09 Dec 2015 15:22:22 +0000
+
+location-service (2.1+15.04.20151202.1-0ubuntu1) vivid; urgency=medium
+
+  * Ensure that event connections are cleaned up on destruction. (LP:
+    #1480877)
+
+ -- Thomas Voß <[e-mail]>  Wed, 02 Dec 2015 12:12:21 +0000
+
+location-service (2.1+15.04.20151127-0ubuntu1) vivid; urgency=medium
+
+  [ 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
+
+ -- Thomas Voß <[e-mail]>  Fri, 27 Nov 2015 13:00:33 +0000
+
+location-service (2.1+15.04.20151113-0ubuntu1) vivid; urgency=medium
+
+  * Adjust default timeout for downloading GPS XTRA data.
+
+ -- Thomas Voß <[e-mail]>  Fri, 13 Nov 2015 10:33:56 +0000
+
+location-service (2.1+15.04.20151109.2-0ubuntu1) vivid; urgency=medium
+
+  [ 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::ConnectivityManager as harvesting is disabled anyway. (LP:
+    #1462664, #1387643)
+
+ -- David Barth <[e-mail]>  Mon, 09 Nov 2015 20:48:48 +0000
+
+location-service (2.1+15.04.20151022-0ubuntu1) vivid; urgency=medium
+
+  [ 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.
+
+ -- Thomas Voß <[e-mail]>  Thu, 22 Oct 2015 07:16:50 +0000
 
 location-service (2.1+15.04.20150427.1-0ubuntu1) vivid; urgency=medium
 
 
=== modified file 'debian/control'
--- debian/control	2015-07-15 19:04:43 +0000
+++ debian/control	2016-04-05 17:17:30 +0000
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to control.in instead.
+# This file is regenerated automatically in the clean target.
+#
 Source: location-service
 Section: utils
 Priority: optional
@@ -27,6 +32,7 @@
                libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
                libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
                libproperties-cpp-dev,
+               lsb-release,
                trust-store-bin,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/location-service
@@ -35,7 +41,7 @@
 Vcs-Bzr: https://code.launchpad.net/~phablet-team/location-service/trunk
 Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/location-service/trunk/files
 
-Package: libubuntu-location-service2
+Package: libubuntu-location-service3
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -52,7 +58,7 @@
 Architecture: any
 Multi-Arch: foreign
 Recommends: ubuntu-location-service-doc,
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          libdbus-1-dev,
          libdbus-cpp-dev,
          libboost-dev,
@@ -68,7 +74,7 @@
 Section: debug
 Architecture: any
 Multi-Arch: foreign
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          ${misc:Depends},
 Description: location service aggregating position/velocity/heading
  updates and exporting them over dbus.
@@ -86,7 +92,7 @@
 
 Package: ubuntu-location-service-bin
 Architecture: any
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          trust-store-bin,
@@ -100,7 +106,7 @@
 Package: ubuntu-location-service-examples
 Architecture: any
 Multi-Arch: same
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          ubuntu-location-service-doc,
 
=== added file 'debian/control.in'
--- debian/control.in	1970-01-01 00:00:00 +0000
+++ debian/control.in	2016-04-05 17:17:30 +0000
@@ -0,0 +1,123 @@
+Source: location-service
+Section: utils
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Thomas Voß <[e-mail]>
+Build-Depends: cmake,
+               curl,
+               libdbus-cpp-dev (>= 4.1.0),
+               debhelper (>= 9),
+               doxygen,
+               geoclue-ubuntu-geoip,
+               google-mock (>= 1.6.0+svn437),
+               graphviz,
+               libapparmor-dev,
+               libboost-filesystem-dev,
+               libboost-program-options-dev,
+               libboost-system-dev,
+               libdbus-1-dev,
+               libdbus-cpp-dev,
+               libgoogle-glog-dev,
+               libgtest-dev,
+               libiw-dev,
+               libjson-c-dev,
+               libnet-cpp-dev,
+               libprocess-cpp-dev,
+               libtrust-store-dev,
+               libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
+               libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
+               libproperties-cpp-dev,
+               lsb-release,
+               trust-store-bin,
+Standards-Version: 3.9.4
+Homepage: http://launchpad.net/location-service
+# If you aren't a member of ~phablet-team but need to upload packaging changes,
+# just go ahead.  ~phablet-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~phablet-team/location-service/trunk
+Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/location-service/trunk/files
+
+Package: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains the shared library needed by client applications.
+
+Package: libubuntu-location-service-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Recommends: ubuntu-location-service-doc,
+Depends: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@ (= ${binary:Version}),
+         libdbus-1-dev,
+         libdbus-cpp-dev,
+         libboost-dev,
+         ${misc:Depends},
+Suggests: ubuntu-location-service-doc,
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains header files required to develop clients talking to the ubuntu
+ location service.
+
+Package: libubuntu-location-service-dbg
+Section: debug
+Architecture: any
+Multi-Arch: foreign
+Depends: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@ (= ${binary:Version}),
+         ${misc:Depends},
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains debug symbols.
+
+Package: ubuntu-location-service-tests
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains all test executables
+
+Package: ubuntu-location-service-bin
+Architecture: any
+Depends: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@ (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+         trust-store-bin,
+Breaks: ubuntu-location-service-examples (<< 0.0.2),
+Replaces: ubuntu-location-service-examples (<< 0.0.2),
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains the service executable and man pages.
+
+Package: ubuntu-location-service-examples
+Architecture: any
+Multi-Arch: same
+Depends: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@ (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+         ubuntu-location-service-doc,
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains example service and client.
+
+Package: ubuntu-location-service-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: ubuntu-location-service-examples,
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains documentation for service and client.
 
=== added file 'debian/get-versions.sh'
--- debian/get-versions.sh	1970-01-01 00:00:00 +0000
+++ debian/get-versions.sh	2016-04-05 17:17:30 +0000
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Michi Henning <[e-mail]>
+
+#
+# Script to read the version numbers from VERSION and QT-VERSION
+# and write the version components and the soversion numbers
+# into separate files, so we can pick them up from both
+# gen-debian-files.sh and CMakeLists.txt.
+#
+
+set -e  # Fail if any command fails.
+
+progname=$(basename $0)
+
+[ $# -lt 1 -o $# -gt 2 ] && {
+    echo "usage: $progname path-to-debian-dir [output-dir]" >&2
+    exit 1
+}
+dir=$1
+output_dir=`pwd`
+[ $# -eq 2 ] && output_dir=$2
+
+# Write the various version numbers into a bunch of files. This allows
+# us to easily pick them up from both bileto_pre_release_hook and CMakeLists.txt.
+
+[ -n "$SERIES" ] || SERIES="$(lsb_release -c -s)"
+
+full_version=$(cat "${dir}"/VERSION)
+
+major=$(echo $full_version | cut -d'.' -f1)
+minor=$(echo $full_version | cut -d'.' -f2)
+micro=$(echo $full_version | cut -d'.' -f3)
+major_minor="${major}.${minor}"
+
+vivid_full_version=$(cat "${dir}"/VERSION.vivid)
+vivid_major=$(echo $vivid_full_version | cut -d'.' -f1)
+vivid_soversion=$vivid_major
+
+if [ "$SERIES" = "vivid" ]
+then
+    soversion=${vivid_soversion}
+else
+    soversion="${major}"
+fi
+[ -n "$soversion" ]
+
+echo ${full_version} >${output_dir}/libubuntu-location-service.full-version
+echo ${major} >${output_dir}/libubuntu-location-service.major-version
+echo ${minor} >${output_dir}/libubuntu-location-service.minor-version
+echo ${micro} >${output_dir}/libubuntu-location-service.micro-version
+echo ${major_minor} >${output_dir}/libubuntu-location-service.major-minor-version
+echo ${soversion} >${output_dir}/libubuntu-location-service.soversion
+echo ${vivid_soversion} >${output_dir}/libubuntu-location-service.vivid-soversion
 
=== modified file 'debian/libubuntu-location-service-dev.install'
--- debian/libubuntu-location-service-dev.install	2014-07-18 14:42:10 +0000
+++ debian/libubuntu-location-service-dev.install	2016-04-05 17:17:30 +0000
@@ -1,4 +1,9 @@
-usr/include/ubuntu-location-service-2
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to libubuntu-location-service-dev.install.in instead.
+# This file is regenerated automatically in the clean target.
+#
+usr/include/ubuntu-location-service-3
 usr/lib/*/libubuntu-location-service.so
 usr/lib/*/libubuntu-location-service-connectivity.so
 usr/lib/*/pkgconfig/ubuntu-location-service.pc
 
=== added file 'debian/libubuntu-location-service-dev.install.in'
--- debian/libubuntu-location-service-dev.install.in	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-location-service-dev.install.in	2016-04-05 17:17:30 +0000
@@ -0,0 +1,5 @@
+usr/include/ubuntu-location-service-@UBUNTU_LOCATION_SERVICE_SOVERSION@
+usr/lib/*/libubuntu-location-service.so
+usr/lib/*/libubuntu-location-service-connectivity.so
+usr/lib/*/pkgconfig/ubuntu-location-service.pc
+usr/lib/*/pkgconfig/ubuntu-location-service-connectivity.pc
 
=== added file 'debian/libubuntu-location-service.install.in'
--- debian/libubuntu-location-service.install.in	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-location-service.install.in	2016-04-05 17:17:30 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libubuntu-location-service.so.*
+usr/lib/*/libubuntu-location-service-connectivity.so.*
 
=== added file 'debian/libubuntu-location-service.install.with-gps.in'
--- debian/libubuntu-location-service.install.with-gps.in	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-location-service.install.with-gps.in	2016-04-05 17:17:30 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/libubuntu-location-service.so.*
+usr/lib/*/libubuntu-location-service-connectivity.so.*
+/etc/gps.conf
 
=== removed file 'debian/libubuntu-location-service2.install'
--- debian/libubuntu-location-service2.install	2014-07-30 13:55:44 +0000
+++ debian/libubuntu-location-service2.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libubuntu-location-service.so.*
-usr/lib/*/libubuntu-location-service-connectivity.so.*
 
=== removed symlink 'debian/libubuntu-location-service2.install.amd64'
=== target was u'libubuntu-location-service2.install.with-gps'
=== removed symlink 'debian/libubuntu-location-service2.install.armhf'
=== target was u'libubuntu-location-service2.install.with-gps'
=== removed symlink 'debian/libubuntu-location-service2.install.i386'
=== target was u'libubuntu-location-service2.install.with-gps'
=== removed file 'debian/libubuntu-location-service2.install.with-gps'
--- debian/libubuntu-location-service2.install.with-gps	2014-07-30 13:55:44 +0000
+++ debian/libubuntu-location-service2.install.with-gps	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/*/libubuntu-location-service.so.*
-usr/lib/*/libubuntu-location-service-connectivity.so.*
-/etc/gps.conf
 
=== modified file 'debian/rules'
--- debian/rules	2015-07-15 19:04:43 +0000
+++ debian/rules	2016-04-05 17:17:30 +0000
@@ -15,6 +15,18 @@
 
 include /usr/share/dpkg/default.mk
 
+distro=$(shell lsb_release -c -s)
+
+ifeq ($(distro),vivid)
+	full_version=$(shell cat $(CURDIR)/debian/VERSION.vivid)
+else
+	full_version=$(shell cat $(CURDIR)/debian/VERSION)
+endif
+
+major=$(shell echo $(full_version) | cut -d'.' -f1)
+minor=$(shell echo $(full_version) | cut -d'.' -f2)
+patch=$(shell echo $(full_version) | cut -d'.' -f3)
+
 ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc arm64))
         LOCATION_SERVICE_ENABLE_GPS_PROVIDER = OFF
 else
@@ -31,4 +43,11 @@
 	dh_strip --dbg-package=libubuntu-location-service-dbg
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DLOCATION_SERVICE_ENABLE_GPS_PROVIDER=$(LOCATION_SERVICE_ENABLE_GPS_PROVIDER)
+	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DLOCATION_SERVICE_ENABLE_GPS_PROVIDER=$(LOCATION_SERVICE_ENABLE_GPS_PROVIDER) -DUBUNTU_LOCATION_SERVICE_VERSION_MAJOR=$(major) -DUBUNTU_LOCATION_SERVICE_VERSION_MINOR=$(minor) -DUBUNTU_LOCATION_SERVICE_VERSION_PATCH=$(patch)
+
+override_dh_auto_clean:
+	rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.amd64
+	rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.armhf
+	rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.i386
+	/bin/sh $(CURDIR)/debian/bileto_pre_release_hook
+	dh_auto_clean
 
=== modified file 'debian/source/format'
--- debian/source/format	2014-07-30 14:15:06 +0000
+++ debian/source/format	2016-04-05 17:17:30 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+3.0 (native)
 
=== modified file 'doc/Doxyfile.in'
--- doc/Doxyfile.in	2014-05-19 09:55:25 +0000
+++ doc/Doxyfile.in	2016-04-05 17:17:30 +0000
@@ -748,7 +748,7 @@
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             =
+IMAGE_PATH             = @CMAKE_CURRENT_SOURCE_DIR@/images
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -1463,7 +1463,7 @@
 # generate an XML file that captures the structure of
 # the code including all documentation.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 
=== added file 'doc/daemon_and_cli.md'
--- doc/daemon_and_cli.md	1970-01-01 00:00:00 +0000
+++ doc/daemon_and_cli.md	2016-04-05 17:17:30 +0000
@@ -0,0 +1,55 @@
+# Service Daemon and CLI
+
+The location service offers a daemon executable and a corresponding
+command-line interface for interacting with it. The daemon does not
+necessarily require root privileges, but might so depending on your
+configuration.
+
+Run the following command to receive an overview of the arguments to
+the daemon:
+
+    ubuntu-location-serviced --help
+
+An example invocation of the daemon, configuring a GPS provider that
+relies on the Android HAL to talk to the chipset, exposing the service
+on the system DBus instance:
+
+    ubuntu-location-serviced --bus system --provider gps::Provider
+
+The cli allows for querying properties of a running service instance, e.g.:
+
+    ubuntu-location-serviced-cli --bus system --get --property is_online
+
+## Configuring an Out-Of-Process Provider
+
+If you want to run a provider out of process, the daemon executable
+allows you to do so by instantiating a so-called remote provider. The
+following invocation of the service tries to connect to the provider
+instance described by the given unique DBus name and path.
+
+    ubuntu-location-serviced \
+	  --bus system \
+	  --provider remote::Provider \
+          --remote::Provider::bus=system \
+	  --remote::Provider::name=com.ubuntu.location.provider.Gps \
+	  --remote::Provider::path=/
+
+Please note that the service allows for decorating provider names to
+uniquely identify per provider configuration options and to allow for
+loading more than one provider of a certain kind. The following
+configuration configures two remote providers, one relying on GPS
+(decorated with @gps) and another one relying on network-based
+positioning (decorated with @network):
+
+    ubuntu-location-serviced \
+	  --bus system \
+	  --provider remote::Provider@gps \
+          --remote::Provider@gps::bus=system \
+	  --remote::Provider@gps::name=com.ubuntu.location.provider.Gps \
+	  --remote::Provider@gps::path=/ \
+	  --provider remote::Provider@network \
+          --remote::Provider@network::bus=system \
+	  --remote::Provider@network::name=com.ubuntu.location.provider.Network \
+	  --remote::Provider@network::path=/
+
+    
 
=== added file 'doc/debugging.md'
--- doc/debugging.md	1970-01-01 00:00:00 +0000
+++ doc/debugging.md	2016-04-05 17:17:30 +0000
@@ -0,0 +1,92 @@
+# Debugging
+
+Location not working? Here's how to debug.
+
+## Layers
+
+Test in OSMTouch (QML app using Qt API) before testing in webapps or
+webbrowser app. Different results? File a bug where it doesn't
+work. Same result of no location? Next step.
+
+## Check that stack works with dummy provider
+
+Edit /etc/init/ubuntu-location-provider.override to start
+location-serviced with just the dummy provider; this should
+work. Doesn't work? File a bug against location-service. Works? Reset
+config to defaults and try the next thing.
+
+## Hardware GPS breaking all of location-service
+
+GPS provider is built-in into location-service and might break all of
+it if it goes south (working on splitting it out); try enabling only
+the HERE provider on the location-serviced command-line and see if
+that works. Works? File a bug against location-service. Doesn't work?
+Move on.
+
+## HERE test
+
+To test whether the low-level HERE stack gets a location, put
+http://people.canonical.com/~lool/espoo-cli on your phone (will be
+included along HERE bits in the future) and run with:
+
+    chmod a+x espoo-cli
+    GLOG_logtostderr=1 GLOG_v=100 LD_LIBRARY_PATH=/custom/vendor/here/location-provider/lib/arm-linux-gnueabihf ./espoo-cli 5
+
+NB: 5 is the number of location updates after which the tool exits;
+updates should come in at approx 15s interval. Output looks like:
+
+    I1101 21:30:01.285964 4403 cli.cpp:117] Requested number of updates is 2
+    I1101 21:30:01.299002 4403 cli.cpp:133] Starting location updates
+    I1101 21:30:01.301888 4403 cli.cpp:141] Starting GLib main loop
+    I1101 21:30:11.304612 4403 cli.cpp:158] Location: tstamp=1414891811 lat=xyz long=foo hor. acc.=2569 alt=nan vert. acc.=nan tech=cell
+    I1101 21:30:11.306061 4403 cli.cpp:170] Remaining updates: 1
+    I1101 21:30:26.736821 4403 cli.cpp:158] Location: tstamp=1414891826 lat=xyz long=foo hor. acc.=2824 alt=nan vert. acc.=nan tech=cell
+    I1101 21:30:26.738348 4403 cli.cpp:148] Stopping location updates
+
+Low-level HERE stack works but location-serviced with just HERE
+provider doesn't work? File a bug against espoo projet (HERE) and/or
+location-service. Low-level HERE stack doesn't work? Move on
+
+## location-service and espoo-service debug
+
+Collect some debug data by editing /etc/init/ubuntu-espoo-service.conf
+and /etc/init/ubuntu-location-service.override and changing the start
+sequence to add some env vars:
+
+    export GLOG_v=200
+    export GLOG_logtostderr=1
+
+before the exec. Reboot, and start some app. You should have some log
+files under /var/log/upstart/ubuntu-espoo-service.log and
+/var/log/upstart/ubuntu-location-service.log to attach to a bug
+report; e.g. a working espoo log looks like this:
+
+    WARNING: Logging before InitGoogleLogging() is written to STDERR
+    I1105 16:30:10.221474  1620 provider.cpp:568] StartPositionUpdates
+    I1105 16:30:10.224901  1620 provider.cpp:122] Successfully started position updates.
+    I1105 16:30:10.228739  1620 provider.cpp:596] StartVelocityUpdates
+    I1105 16:30:13.046851  1621 provider.cpp:83] Received location: Position(lat: Coordinate(12.34 deg), lon: Coordinate(12.34 deg), alt: Coordinate(nan m), hor.acc.: 1430 m, ver.acc.: nan m)
+
+No position there? check connectivity API works by running:
+
+    cd /tmp
+    wget http://people.ubuntu.com/~lool/connectivity
+    GLOG_v=200 GLOG_logtostderr=1 ./connectivity
+
+you should see something like:
+
+    I1105 16:47:26.431466 11140 cached_radio_cell.cpp:160] (mcc: 123, mnc: 2, lac: 1234, id: 123456, asu: 1)
+    I1105 16:47:26.533818 11140 connectivity.cpp:47] Is wifi enabled: true
+    I1105 16:47:26.533963 11140 connectivity.cpp:48] Is wifi hw enabled: true
+    I1105 16:47:26.534010 11140 connectivity.cpp:49] Is wwan enabled: true
+    I1105 16:47:26.534050 11140 connectivity.cpp:50] Is wwan hw enabled: true
+    I1105 16:47:26.534442 11140 connectivity.cpp:122] umts(mcc: 123, mnc: 2, lac: 1234, id: 123456, asu: 1)
+    I1105 16:47:26.534633 11140 connectivity.cpp:155] (bssid: 12:12:12:12:12:12, ssid: xyz, last seen: 1415224046, mode: Mode::infrastructure, frequency: 2442, strength: 63)
+    I1105 16:47:26.534828 11140 connectivity.cpp:155] (bssid: 12:12:12:12:12:12, ssid: boing, last seen: 1415224046, mode: Mode::infrastructure, frequency: 2467, strength: 57)
+
+Also, please attach output of /usr/share/ofono/scripts/list-modems > list-modems-output.txt
+Please note that the command might take ~1 minute to complete.
+
+TODO: document dbus-monitor / d-feet capturing of client / system traffic with snooping config.
+
+
 
=== added file 'doc/hacking.md'
--- doc/hacking.md	1970-01-01 00:00:00 +0000
+++ doc/hacking.md	2016-04-05 17:17:30 +0000
@@ -0,0 +1,146 @@
+# Hacking
+
+
+## Building the code
+
+By default, the code is built in release mode. To build a debug version, use
+
+    $ mkdir builddebug
+    $ cd builddebug
+    $ cmake -DCMAKE_BUILD_TYPE=debug ..
+    $ make
+
+For a release version, use -DCMAKE_BUILD_TYPE=release
+
+## Running the tests
+
+    $ make
+    $ make test
+
+Note that "make test" alone is dangerous because it does not rebuild
+any tests if either the library or the test files themselves need
+rebuilding. It's not possible to fix this with cmake because cmake cannot
+add build dependencies to built-in targets. To make sure that everything
+is up-to-date, run "make" before running "make test"!
+
+## Coverage
+
+To build with the flags for coverage testing enabled and get coverage:
+
+    $ mkdir buildcoverage
+    $ cd buildcoverage
+    $ cmake -DCMAKE_BUILD_TYPE=coverage
+    $ make
+    $ make test
+    $ make coverage
+
+Unfortunately, it is not possible to get 100% coverage for some files,
+mainly due to gcc's generation of two destructors for dynamic and non-
+dynamic instances. For abstract base classes and for classes that
+prevent stack and static allocation, this causes one of the destructors
+to be reported as uncovered.
+
+There are also issues with some functions in header files that are
+incorrectly reported as uncovered due to inlining, as well as
+the impossibility of covering defensive assert(false) statements,
+such as an assert in the default branch of a switch, where the
+switch is meant to handle all possible cases explicitly.
+
+If you run a binary and get lots of warnings about a "merge mismatch for summaries",
+this is caused by having made changes to the source that add or remove code
+that was previously run, so the new coverage output cannot sensibly be merged
+into the old coverage output. You can get rid of this problem by running
+
+    $ make clean-coverage
+
+This deletes all the .gcda files, allowing the merge to (sometimes) succeed again.
+If this doesn't work either, the only remedy is to do a clean build.
+
+If lcov complains about unrecognized lines involving '=====',
+you can patch geninfo and gcovr as explained here:
+
+https://bugs.launchpad.net/gcovr/+bug/1086695/comments/2
+
+## Code style
+
+We use a format tool that fixes a whole lot of issues
+regarding code style. The formatting changes made by
+the tool are generally sensible (even though they may not be your
+personal preference in all cases). If there is a case where the formatting
+really messes things up, consider re-arranging the code to avoid the problem.
+The convenience of running the entire code base through the pretty-printer
+far outweighs any minor glitches with pretty printing, and it means that
+we get consistent code style for free, rather than endlessly having to
+watch out for formatting issues during code reviews.
+
+As of clang-format-3.7, you can use
+
+    // clang-format off
+    void    unformatted_code  ;
+    // clang-format on
+
+to suppress formatting for a section of code.
+
+To format specific files:
+
+    ${CMAKE_BINARY_DIR}/tools/formatcode x.cpp x.h
+
+If no arguments are provided, formatcode reads stdin and writes
+stdout, so you can easily pipe code into the tool from within an
+editor. For example, to reformat the entire file in vi (assuming
+${CMAKE_BINARY_DIR}/tools is in your PATH):
+
+    1G!Gformatcode
+
+To re-format all source and header files in the tree:
+
+    $ make formatcode
+
+## Thread and address sanitizer
+
+Set SANITIZER to "thread" or "address" to build with the
+corresponding sanitizer enabled.
+
+## Updating symbols file
+
+To easily spot new/removed/changed symbols in the library, the debian
+package maintains a .symbols file that lists all exported symbols
+present in the library .so. If you add new public symbols to the library,
+it's necessary to refresh the symbols file, otherwise the package will
+fail to build. The easiest way to do that is using bzr-builddeb:
+
+    $ bzr bd -- -us -uc -j8  # Don't sign source package or changes file, 8 compiles in parallel
+    $ # this will exit with an error if symbols file isn't up-to-date
+    $ cd ../build-area/location-service-[version]
+    $ ./obj-[arch]/tools/symbol_diff
+
+This creates a diff of the symbols in /tmp/symbols.diff.
+(The demangled symbols from the debian build are in ./new_symbols.)
+
+Review any changes in /tmp/symbols.diff. If they are OK:
+
+    $ cd -
+    $ patch -p0 < /tmp/symbols.diff
+
+## ABI compliance test
+
+To use this, install abi-compliance-checker package from the archives.
+
+You can use abi-compliance-checker to test whether a particular build
+is ABI compatible with another build. The tool does some source-level
+analysis in addition to checking library symbols, so it catches things
+that are potentially dangerous, but won't be picked up by just looking
+at the symbol table.
+
+Assume you have built devel in src/devel, and you have a later build
+in src/mybranch and want to check that mybranch is still compatible.
+To run the compliance test:
+
+    $ cd src
+    $ abi-compliance-checker -lib libunity-scopes.so -old devel/build/test/abi-compliance/abi.xml -new mybranch/build/test/abi-compliance/abi.xml
+
+The script will take about two minutes to run. Now point your browser at 
+
+    src/compat_reports/libunity-scopes.so/[version]_to_[version]/compat_report.html
+
+The report provides a nicely layed-out page with all the details.
 
=== added directory 'doc/images'
=== added file 'doc/images/LocationServiceHighLevel.png'
 Binary files doc/images/LocationServiceHighLevel.png	1970-01-01 00:00:00 +0000 and doc/images/LocationServiceHighLevel.png	2016-04-05 17:17:30 +0000 differ
=== added file 'doc/intro.md'
--- doc/intro.md	1970-01-01 00:00:00 +0000
+++ doc/intro.md	2016-04-05 17:17:30 +0000
@@ -0,0 +1,67 @@
+# Introduction               {#mainpage}
+
+Ubuntu's location service is a central hub for multiplexing access to
+positioning subsystems available via hard- and software. It provides a
+client API offering positioning capabilities to applications and other
+system components, abstracting away the details of individual
+positioning solutions.
+
+## Vocabulary
+
+To make the remainder of this documentation as easily understandable
+as possible, we start over with introducing some vocabulary:
+
+- Engine: 
+    Responsible for handling input from multiple positioning
+    subsystems and maintaining the state of the overall system. Think
+    about it like the heart of the system.
+
+- Provider: 
+    A positioning subsystem that feeds into the positioning
+    engine. Common examples are a GPS provider or a network-based
+    positioning provider.
+
+- Service:
+    The point of entry for applications and services that would
+    like to receive position data.
+
+- Session:
+    In order to receive position information, every application
+    or service has to create a session with the location Service.
+
+- Update: An update is a timestamped entity to a certain type of data.
+
+- [WGS84, http://en.wikipedia.org/wiki/World_Geodetic_System]: The coordinate system that is used throughout the entire location subsystem.
+
+## Architectural Overview
+
+The high-level architecture of the service is shown in the following diagram:
+
+![High-level architectural overview](images/LocationServiceHighLevel.png)
+
+In this diagram, the configuration of the engine refers to:
+
+  * The current state of any satellite-based positioning subsystems. Can either be off or on.
+  * The current state of reporting facilities responsible for harvesting wifi and cell id measurements together with location information and sending them off to remote services. Can either be off or on.
+  * The overall state of the engine. Can either be off, on or active.
+
+The Service takes this configuration and exposes it to client
+applications. In addition, mainly for debugging purposes, the set of
+currently visible satellites (if any) is maintained and exposed to
+privileged client applications.
+
+## Privacy & Access Control
+
+Location information is highly privacy relevant. For this reason, the
+location service is deeply integrated with AppArmor and Ubuntu's
+overall trust infrastructure. Every incoming session request is
+validated and if in doubt, the user is asked to explicitly grant trust
+to the application requesting access to positioning
+information. Please see [@ref com::ubuntu::location::service::PermissionManager]
+for further details.
+
+In addition, the location service allows for selectively adjusting the
+accuracy and reporting setup of the location Engine to provide further
+fine-grained control over the exposed data to user. Within this setup,
+a user is able to entirely disable all positioning.
+
 
=== added file 'doc/manual_testing.md'
--- doc/manual_testing.md	1970-01-01 00:00:00 +0000
+++ doc/manual_testing.md	2016-04-05 17:17:30 +0000
@@ -0,0 +1,174 @@
+# Manual Testplan
+
+[TOC]
+
+While the automatic test suite of the location service is
+comprehensive and covers large parts of the functionality of the
+service itself, we still provide an additional level of acceptance
+testing covering the entire location stack/experience as a part of
+this document.
+
+## Dependents/Clients
+
+ - qtubuntu-sensors
+ - Qt/QML applications:
+   - Browser
+   - osmTouch
+
+## Test Plan
+
+This test plan is not supposed to be complete; use it to guide your
+manual testing so you don't miss big functional areas that are part of
+the component; also this should be used as guideline to inspire the
+exploratory testing which should be adapted smartly based on the real
+content of a MP.
+
+Please note that if you're testing the GPS provider, the location
+service relies on GPS hardware to obtain a location fix. For that, it
+might be required that you execute the manual steps listed before
+close to a window or ideally outside, with good satellite visibility
+conditions.
+
+__Note: It can take up to 15 minutes for the GPS device to get a lock, due to lack of assisted GPS__
+
+ - Install latest image on phone
+ - Install freshly built MPs that are needed for landing
+
+Depending on the default configuration of location-service on the
+image, you may skip parts of this test plan. E.g. if GPS hardware is
+disabled, skip this part. You can see which providers are enabled by
+looking at the list of providers on the location-serviced command-line
+(`ps fauxw | grep location-service`, then look at the `--provider`
+flags).
+
+### Dummy provider
+
+This tests forces location-service to use only the dummy provider;
+this providers a baseline test for the app to trust-store to
+location-service path.
+
+ - phablet-shell into the phone:
+   - `sudo service ubuntu-location-service stop && sudo /usr/bin/ubuntu-location-serviced --bus system --provider dummy::Provider --dummy::Provider::ReferenceLocationLat=48.857503 --dummy::Provider::ReferenceLocationLon=2.295072`
+ - As phablet, start the trust store again (it stops when location-service is stopped) with: `start ubuntu-location-service-trust-stored`
+ - Ensure that all AP tests for the webbrowser pass as expected
+ - Point the browser to maps.google.com (alternatively: here.com, maps.bing.fr).
+ - Request centering the map on current position and observe if it works correctly (should show the Eiffel tower)
+ - Install osmTouch from the app store
+ - Launch osmTouch and check if it centers on the Eiffel tower.
+ - Install a maps webapp such as HERE or Google Maps webapp from the app store
+ - Launch maps webapp and check if it centers on the Eiffel tower.
+
+### GPS Test Plan
+
+This applies only if GPS provider is enabled.
+
+ - (If applicable: Remember to add the silo you are testing)
+ - `sudo apt-get install ubuntu-location-service-tests`
+ - If you want to send off crowdsourced information, i.e., information about visible wifis and visible radio cells for the obtained location fixes to Mozilla's location service and our own instance: 
+   - `sudo GLOG_v=40 GLOG_logtostderr=1 GPS_TEST_ENABLE_HARVESTING_DURING_TESTS=1  /usr/bin/uls-tests/gps_provider_test --gtest_filter=*.time_to_first_fix_cold_start_without_supl_benchmark_requires_hardware`
+ - If you '''don't''' want to send off crowdsourced information:
+   - `sudo GLOG_v=40 GLOG_logtostderr=1 /usr/bin/uls-tests/gps_provider_test --gtest_filter=*.time_to_first_fix_cold_start_without_supl_benchmark_requires_hardware`
+
+ - The test will output a lot of diagnostic information to the
+   terminal and will take ~30 minutes. If satellite visibility is
+   limited, it can take even longer. The test will automatically
+   report success or failure.
+
+### Preliminary AGPS Test Plan
+
+**Does not apply to Krillin**
+
+Please note that the Krillin GPS chipset driver and its integration
+within Ubuntu does not support vanilla AGPS (i.e., SUPL) right
+now. For that, this test case is irrelevant for Krillin and is likely
+to fail.
+
+This applied only if GPS provider and some other provider (giving
+_A_ssistance) are enabled.
+
+ - Add the silo.
+ - `sudo apt-get install ubuntu-location-service-tests`
+ - Obtain a (rough) location estimate for your current location on Google maps.
+ - Make sure to replace INSERT_ESTIMATE_HERE with the respective
+   values obtained from Google maps.
+ - If you want to send off crowdsourced information, i.e., information
+   about visible wifis and visible radio cells for the obtained
+   location fixes to Mozilla's location service and our own instance:
+   - `sudo GLOG_v=40 GLOG_logtostderr=1 GPS_TEST_ENABLE_HARVESTING_DURING_TESTS=1  GPS_TEST_REF_LAT=INSERT_ESTIMATE_HERE GPS_TEST_REF_LON=INSERT_ESTIMATE_HERE /usr/bin/uls-tests/gps_provider_test --gtest_filter=*.time_to_first_fix_cold_start_with_supl_benchmark_requires_hardware`
+ - If you '''don't''' want to send off crowdsourced information:
+   - `sudo GLOG_v=40 GLOG_logtostderr=1 GPS_TEST_REF_LAT=INSERT_ESTIMATE_HERE GPS_TEST_REF_LON=INSERT_ESTIMATE_HERE /usr/bin/uls-tests/gps_provider_test --gtest_filter=*.time_to_first_fix_cold_start_with_supl_benchmark_requires_hardware`
+
+ - The test will output a lot of diagnostic information to the
+   terminal and will take ~10 minutes or less. The test will
+   automatically report success or failure.
+
+### Espoo / HERE provider
+
+This applies only if the Espoo / HERE remote provider is enabled. This
+provider should be enabled by default and may either work standalone
+as the only provider or as an assistance for the GPS hardware to lock.
+
+ - Add the silo; special exception for lxc-android-config: see https://wiki.ubuntu.com/Touch/Testing/lxc-android-config
+ - If noted, deploy an updated custom tarball:
+   - Download the tarball under /tmp ('''NOT''' under /)
+   - Unpack there: `cd /tmp; sudo tar xvf custom-vendor-here-*.tar.xz`
+   - Remove older bits: `sudo rm -rf /custom/vendor/here/`
+   - Update custom bits: `sudo mv /tmp/system/custom/vendor/here /custom/vendor`
+ - Reboot
+ - After boot, check you have these three processes running on top of location-service:
+   - slpgwd
+   - posclientd
+   - ubuntu-espoo-service
+ - Make sure SIM is unlocked and attached to the network (has some reliable signal) and that WiFi is turned on.
+ - Install OSMTouch app
+ - Run OSMTouch app, hit the position button every other second until you get a blue circle showing your current location; 
+
+# Connectivity API
+
+For integration of network-based positioning providers, the location
+service offers a connectivity API that provides access to wifi and
+cell measurements as well as information on the current overall
+connectivity status of the device. Please execute the following
+commands on a newly flashed device with a writable image:
+
+  - `sudo apt-get update && sudo apt-get build-dep location-service && sudo apt-get install libubuntu-location-service-dev ubuntu-location-service-examples`
+  - `mkdir /tmp/build && cd /tmp/build && cmake /usr/share/ubuntu-location-service/examples/standalone/connectivity/ && make`
+  - `GLOG_logtostderr=1 ./connectivity`
+
+Verify that the output looks similar to:
+
+    phablet@ubuntu-phablet:/tmp/build$ ./connectivity 
+    Is wifi enabled: true
+    Is wifi hw enabled: true
+    Is wwan enabled: false
+    Is wwan hw enabled: true
+    umts(mcc: 262, mnc: 2, lac: 5313, id: 131948771, asu: 7)
+    (bssid: BC:F2:AF:AF:19:A2, ssid: devolo-bcf2afaf19a2, last seen: 1408955086, mode: Mode::infrastructure, frequency: 2462, strength: 72)
+    (bssid: 00:22:3F:35:43:58, ssid: JustAnotherWLAN, last seen: 1408955086, mode: Mode::infrastructure, frequency: 2412, strength: 24)
+    (bssid: 82:C7:A6:40:8C:4E, ssid: EasyBox-44D054, last seen: 1408955206, mode: Mode::infrastructure, frequency: 2417, strength: 17)
+    (bssid: 00:24:01:B8:32:8D, ssid: gra, last seen: 1408955086, mode: Mode::infrastructure, frequency: 2412, strength: 12)
+    (bssid: C0:25:06:3C:28:22, ssid: FRITZ!Box 6360 Cable, last seen: 1408954966, mode: Mode::infrastructure, frequency: 2412, strength: 17)
+    (bssid: 00:1C:4A:A5:B7:59, ssid: FRITZ!Box Fon WLAN 7170, last seen: 1408954966, mode: Mode::infrastructure, frequency: 2437, strength: 10)
+    Last seen changed for wifi (bssid: BC:F2:AF:AF:19:A2, ssid: devolo-bcf2afaf19a2, last seen: 1408955257, mode: Mode::infrastructure, frequency: 2462, strength: 72)
+    Last seen changed for wifi (bssid: 00:22:3F:35:43:58, ssid: JustAnotherWLAN, last seen: 1408955257, mode: Mode::infrastructure, frequency: 2412, strength: 24)
+    Signal strength changed for wifi: (bssid: BC:F2:AF:AF:19:A2, ssid: devolo-bcf2afaf19a2, last seen: 1408955257, mode: Mode::infrastructure, frequency: 2462, strength: 73)
+
+# Trust Store Integration
+
+Please note that we are assuming a freshly wiped system for testing
+here. If you cannot fulfill that pre-condition, please run `rm -rf
+/home/phablet/.local/share/UbuntuLocationService && sudo shutdown -r` prior to running the
+tests:
+
+## Unconfined
+
+ - Open the browser, go to maps.google.com
+ - Observe the in-browser dialog asking for granting access to location.
+
+## Confined Web-App
+ 
+ - Open the Nokia Here web app, observe the trust dialog appearing.
+
+## Confined Application
+
+ - Open osmtouch and observe the osmtouch surface sliding up, presenting you with a trust dialog.
 
=== added file 'doc/tips_n_tricks.md'
--- doc/tips_n_tricks.md	1970-01-01 00:00:00 +0000
+++ doc/tips_n_tricks.md	2016-04-05 17:17:30 +0000
@@ -0,0 +1,21 @@
+# Tips'n'Tricks
+
+## Mark HERE license as accepted from cmdline
+
+    sudo LC_ALL=C gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Set com.ubuntu.location.providers.here.AccountsService LicenseAccepted '<true>'
+
+## Force startup after ofono and NM are started
+
+This is a *workaround* to get connectivity API to collect; mount your
+system read-write and edit
+/etc/init/ubuntu-location-provider-here-slpgwd.conf:
+
+    sudo mount -o remount,rw /
+    sudo vi /etc/init/ubuntu-location-provider-here-slpgwd.conf
+
+change: `start on started dbus and (started ofono or started network-manager)`
+to: `start on started dbus and started ofono and started network-manager`
+
+    sudo mount -o remount,ro /
+    sync
+    sudo reboot
 
=== modified file 'examples/service/service.cpp'
--- examples/service/service.cpp	2014-11-14 11:26:45 +0000
+++ examples/service/service.cpp	2016-04-05 17:17:30 +0000
@@ -99,7 +99,10 @@
     auto selected_providers = options.value_for_key<std::vector<std::string>>("provider");
 
     std::map<std::string, cul::ProviderFactory::Configuration> config_lut;
-    std::set<cul::Provider::Ptr> instantiated_providers;
+
+    culs::DefaultConfiguration config;
+    auto settings = std::make_shared<cul::BoostPtreeSettings>(options.value_for_key<std::string>("config-file"));
+    auto engine = config.the_engine(std::set<cul::Provider::Ptr>{}, config.the_provider_selection_policy(), settings);
 
     for (const std::string& provider : selected_providers)
     {
@@ -129,15 +132,15 @@
 
         try
         {
-            auto p = cul::ProviderFactory::instance().create_provider_for_name_with_config(
-                provider, 
-                config_lut[provider]);
-
-            if (p)
-                instantiated_providers.insert(p);
-            else
-                throw std::runtime_error("Problem instantiating provider");
-            
+            auto result = std::async(std::launch::async, [provider, config_lut, engine] {
+                return cul::ProviderFactory::instance().create_provider_for_name_with_config(
+                    provider,
+                    config_lut.at(provider),
+                    [engine](cul::Provider::Ptr provider)
+                    {
+                        engine->add_provider(provider);
+                    });
+            });
         } catch(const std::runtime_error& e)
         {
             std::cerr << "Exception instantiating provider: " << e.what() << " ... Aborting now." << std::endl;
@@ -163,15 +166,11 @@
     };
     outgoing->install_executor(dbus::asio::make_executor(outgoing));
 
-    auto settings = std::make_shared<cul::BoostPtreeSettings>(options.value_for_key<std::string>("config-file"));
-
-    culs::DefaultConfiguration config;
-
     culs::Implementation::Configuration configuration
     {
         incoming,
         outgoing,
-        config.the_engine(instantiated_providers, config.the_provider_selection_policy(), settings),
+        engine,
         config.the_permission_manager(incoming),
         culs::Harvester::Configuration
         {
 
=== modified file 'include/location_service/com/ubuntu/location/provider_factory.h'
--- include/location_service/com/ubuntu/location/provider_factory.h	2014-10-27 21:58:16 +0000
+++ include/location_service/com/ubuntu/location/provider_factory.h	2016-04-05 17:17:30 +0000
@@ -54,6 +54,9 @@
     // --provider=remote::Provider@gps --remote::Provider@gps::name="com.ubuntu.android.gps.Provider" --remote::Provider@gps::path="/com/ubuntu/android/gps/Provider"
     Provider::Ptr create_provider_for_name_with_config(const std::string& name, const Configuration& config);
 
+    // Async version of above.
+    void create_provider_for_name_with_config(const std::string& name, const Configuration& config, const std::function<void(Provider::Ptr)>& cb);
+
     void enumerate(const std::function<void(const std::string&, const Factory&)>& enumerator);
 
   private:
 
=== modified file 'po/ubuntu-location-service.pot'
--- po/ubuntu-location-service.pot	2014-09-19 09:06:30 +0000
+++ po/ubuntu-location-service.pot	2016-04-05 17:17:30 +0000
@@ -1,13 +1,14 @@
-# Copyright (C) 2014 Canonical Ltd.
-# This file is distributed under the same license as the ubuntu-location-service package.
-# Thomas Voß <[e-mail]>, 2014.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ubuntu-location-service\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"POT-Creation-Date: 2015-11-27 14:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,11 +17,6 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
-msgid "An unconfined application wants to access your current location."
-msgstr ""
-
-#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
-#, boost-format
-msgid "%1% wants to access your current location."
+#: /home/tvoss/ubuntu/scratch/fix-prompt-string/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:149
+msgid "wants to access your current location."
 msgstr ""
 
=== modified file 'src/location_service/com/ubuntu/location/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/CMakeLists.txt	2015-04-23 14:48:44 +0000
+++ src/location_service/com/ubuntu/location/CMakeLists.txt	2016-04-05 17:17:30 +0000
@@ -38,6 +38,7 @@
   service/harvester.cpp
   service/demultiplexing_reporter.h
   service/demultiplexing_reporter.cpp
+  service/runtime.cpp
   service/runtime_tests.h
   service/runtime_tests.cpp
   service/trust_store_permission_manager.cpp
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp'
--- src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp	2015-05-28 10:57:24 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp	2016-04-05 17:17:30 +0000
@@ -123,7 +123,14 @@
         const org::freedesktop::NetworkManager::Device& device,
         const org::freedesktop::NetworkManager::AccessPoint& ap)
     : device_(device),
-      access_point_(ap)
+      access_point_(ap),
+      connections
+      {
+          access_point_.properties_changed->connect([this](const std::map<std::string, core::dbus::types::Variant>& dict)
+          {
+              on_access_point_properties_changed(dict);
+          })
+      }
 {
     last_seen_ = translate_time_stamp(access_point_.last_seen->get());
 
@@ -138,12 +145,11 @@
     {
         static_cast<int>(access_point_.strength->get())
     };
+}
 
-    // Wire up all the connections
-    access_point_.properties_changed->connect([this](const std::map<std::string, core::dbus::types::Variant>& dict)
-    {
-        on_access_point_properties_changed(dict);
-    });
+detail::CachedWirelessNetwork::~CachedWirelessNetwork()
+{
+    access_point_.properties_changed->disconnect(connections.ap_properties_changed);
 }
 
 void detail::CachedWirelessNetwork::on_access_point_properties_changed(const std::map<std::string, core::dbus::types::Variant>& dict)
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h'
--- src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h	2014-08-14 20:25:22 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h	2016-04-05 17:17:30 +0000
@@ -41,6 +41,8 @@
             const org::freedesktop::NetworkManager::Device& device,
             const org::freedesktop::NetworkManager::AccessPoint& ap);
 
+    ~CachedWirelessNetwork();
+
     // Timestamp when the network became visible.
     const core::Property<std::chrono::system_clock::time_point>& last_seen() const override;
 
@@ -67,6 +69,16 @@
     // The actual access point stub.
     org::freedesktop::NetworkManager::AccessPoint access_point_;
 
+    // Encapsulates all event connections that have to be cut on destruction.
+    struct
+    {
+        core::dbus::Signal
+        <
+            org::freedesktop::NetworkManager::AccessPoint::PropertiesChanged,
+            org::freedesktop::NetworkManager::AccessPoint::PropertiesChanged::ArgumentType
+        >::SubscriptionToken ap_properties_changed;
+    } connections;
+
     core::Property<std::chrono::system_clock::time_point> last_seen_;
     core::Property<std::string> bssid_;
     core::Property<std::string> ssid_;
 
=== 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-05-27 18:40:37 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2016-04-05 17:17:30 +0000
@@ -595,7 +595,7 @@
 
     xdg::NetworkManager::AccessPoint ap
     {
-        network_manager->service->add_object_for_path(ap_path)
+        network_manager->service->object_for_path(ap_path)
     };
 
     auto wifi = std::make_shared<detail::CachedWirelessNetwork>(itd->second, ap);
 
=== modified file 'src/location_service/com/ubuntu/location/engine.cpp'
--- src/location_service/com/ubuntu/location/engine.cpp	2015-04-23 14:48:44 +0000
+++ src/location_service/com/ubuntu/location/engine.cpp	2016-04-05 17:17:30 +0000
@@ -97,10 +97,7 @@
                 Configuration::Keys::engine_state,
                 Configuration::Defaults::engine_state);
 
-    configuration.satellite_based_positioning_state =
-            settings->get_enum_for_key<SatelliteBasedPositioningState>(
-                Configuration::Keys::satellite_based_positioning_state,
-                Configuration::Defaults::satellite_based_positioning_state);
+    configuration.satellite_based_positioning_state = Configuration::Defaults::satellite_based_positioning_state;
 
     configuration.wifi_and_cell_id_reporting_state =
             settings->get_enum_for_key<WifiAndCellIdReportingState>(
@@ -110,12 +107,7 @@
     configuration.engine_state.changed().connect([this](const Engine::Status& status)
     {
         Engine::settings->set_enum_for_key<Engine::Status>(Configuration::Keys::engine_state, status);
-    });
-
-    configuration.satellite_based_positioning_state.changed().connect([this](SatelliteBasedPositioningState state)
-    {
-        Engine::settings->set_enum_for_key<SatelliteBasedPositioningState>(Configuration::Keys::satellite_based_positioning_state, state);
-    });
+    });    
 
     configuration.wifi_and_cell_id_reporting_state.changed().connect([this](WifiAndCellIdReportingState state)
     {
@@ -129,10 +121,6 @@
         Configuration::Keys::engine_state,
         configuration.engine_state);
 
-    settings->set_enum_for_key<SatelliteBasedPositioningState>(
-        Configuration::Keys::satellite_based_positioning_state,
-        configuration.satellite_based_positioning_state);
-
     settings->set_enum_for_key<WifiAndCellIdReportingState>(
         Configuration::Keys::wifi_and_cell_id_reporting_state,
         configuration.wifi_and_cell_id_reporting_state);
@@ -169,19 +157,28 @@
 
     // We wire up changes in the engine's configuration to the respective slots
     // of the provider.
-    auto cp = updates.reference_location.changed().connect([provider](const cul::Update<cul::Position>& pos)
-    {
-        provider->on_reference_location_updated(pos);
-    });
-
-    auto cv = updates.reference_velocity.changed().connect([provider](const cul::Update<cul::Velocity>& velocity)
-    {
-        provider->on_reference_velocity_updated(velocity);
-    });
-
-    auto ch = updates.reference_heading.changed().connect([provider](const cul::Update<cul::Heading>& heading)
-    {
-        provider->on_reference_heading_updated(heading);
+    auto cp = updates.last_known_location.changed().connect([provider](const cul::Optional<cul::Update<cul::Position>>& pos)
+    {
+        if (pos)
+        {
+            provider->on_reference_location_updated(pos.get());
+        }
+    });
+
+    auto cv = updates.last_known_velocity.changed().connect([provider](const cul::Optional<cul::Update<cul::Velocity>>& velocity)
+    {
+        if (velocity)
+        {
+            provider->on_reference_velocity_updated(velocity.get());
+        }
+    });
+
+    auto ch = updates.last_known_heading.changed().connect([provider](const cul::Optional<cul::Update<cul::Heading>>& heading)
+    {
+        if (heading)
+        {
+            provider->on_reference_heading_updated(heading.get());
+        }
     });
 
     auto cr = configuration.wifi_and_cell_id_reporting_state.changed().connect([provider](cul::WifiAndCellIdReportingState state)
@@ -207,7 +204,7 @@
     // We should come up with a better heuristic here.
     auto cpr = provider->updates().position.connect([this](const cul::Update<cul::Position>& src)
     {
-        updates.reference_location = update_policy->verify_update(src);
+        updates.last_known_location = update_policy->verify_update(src);
     });
 
     std::lock_guard<std::mutex> lg(guard);
 
=== modified file 'src/location_service/com/ubuntu/location/engine.h'
--- src/location_service/com/ubuntu/location/engine.h	2015-04-23 14:48:44 +0000
+++ src/location_service/com/ubuntu/location/engine.h	2016-04-05 17:17:30 +0000
@@ -127,11 +127,11 @@
     struct Updates
     {
         /** The current best known reference location */
-        core::Property<Update<Position>> reference_location{};
+        core::Property<Optional<Update<Position>>> last_known_location{};
         /** The current best known velocity estimate. */
-        core::Property<Update<Velocity>> reference_velocity{};
+        core::Property<Optional<Update<Velocity>>> last_known_velocity{};
         /** The current best known heading estimate. */
-        core::Property<Update<Heading>> reference_heading{};
+        core::Property<Optional<Update<Heading>>> last_known_heading{};
         /** The current set of visible SpaceVehicles. */
         core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>> visible_space_vehicles{};
     };
 
=== modified file 'src/location_service/com/ubuntu/location/provider_factory.cpp'
--- src/location_service/com/ubuntu/location/provider_factory.cpp	2014-10-27 21:58:16 +0000
+++ src/location_service/com/ubuntu/location/provider_factory.cpp	2016-04-05 17:17:30 +0000
@@ -52,6 +52,20 @@
     return cul::Provider::Ptr{factory_store.at(undecorated_name)(config)};
 }
 
+void cul::ProviderFactory::create_provider_for_name_with_config(
+    const std::string& name,
+    const cul::ProviderFactory::Configuration& config,
+    const std::function<void(Provider::Ptr)>& cb)
+{
+    auto undecorated_name = name.substr(0, name.find("@"));
+
+    std::lock_guard<std::mutex> lg(guard);
+    if (factory_store.count(undecorated_name) == 0)
+        return;
+
+    cb(cul::Provider::Ptr{factory_store.at(undecorated_name)(config)});
+}
+
 void cul::ProviderFactory::enumerate(
     const std::function<void(const std::string&, const cul::ProviderFactory::Factory&)>& enumerator)
 {
 
=== modified file 'src/location_service/com/ubuntu/location/providers/config.cpp'
--- src/location_service/com/ubuntu/location/providers/config.cpp	2014-09-15 08:58:50 +0000
+++ src/location_service/com/ubuntu/location/providers/config.cpp	2016-04-05 17:17:30 +0000
@@ -19,6 +19,7 @@
 #include <com/ubuntu/location/provider_factory.h>
 
 #include "dummy/provider.h"
+#include "dummy/delayed_provider.h"
 
 #include <map>
 
@@ -41,6 +42,12 @@
     com::ubuntu::location::providers::dummy::Provider::create_instance
 };
 
+static FactoryInjector dummy_delayed_injector
+{
+    "dummy::DelayedProvider",
+    com::ubuntu::location::providers::dummy::DelayedProvider::create_instance
+};
+
 #include <com/ubuntu/location/providers/remote/provider.h>
 static FactoryInjector remote_injector
 {
 
=== modified file 'src/location_service/com/ubuntu/location/providers/dummy/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/providers/dummy/CMakeLists.txt	2014-02-07 17:16:49 +0000
+++ src/location_service/com/ubuntu/location/providers/dummy/CMakeLists.txt	2016-04-05 17:17:30 +0000
@@ -2,7 +2,9 @@
   dummy
   
   provider.h
-  provider.cpp)
+  provider.cpp
+  delayed_provider.h
+  delayed_provider.cpp)
 
 set(
   ENABLED_PROVIDER_TARGETS
 
=== added file 'src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.cpp'
--- src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.cpp	2016-04-05 17:17:30 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Scott Sweeny <[e-mail]>
+ */
+
+#include <com/ubuntu/location/logging.h>
+
+#include <chrono>
+#include <thread>
+
+#include "delayed_provider.h"
+
+namespace location = com::ubuntu::location;
+namespace dummy = com::ubuntu::location::providers::dummy;
+
+std::string dummy::DelayedProvider::class_name()
+{
+    return "dummy::DelayedProvider";
+}
+
+location::Provider::Ptr dummy::DelayedProvider::create_instance(const ProviderFactory::Configuration& config)
+{
+    int delay = config.get(dummy::DelayConfiguration::Keys::delay, 0);
+    VLOG(1) << __PRETTY_FUNCTION__ << ": delay for " << delay << "ms";
+
+    std::this_thread::sleep_for(std::chrono::milliseconds{delay});
+
+    return dummy::Provider::create_instance(config);
+}
 
=== added file 'src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.h'
--- src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.h	2016-04-05 17:17:30 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Scott Sweeny <[e-mail]>
+ */
+
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_DUMMY_DELAYED_PROVIDER_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_DUMMY_DELAYED_PROVIDER_H_
+
+#include "provider.h"
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+namespace providers
+{
+namespace dummy
+{
+    struct DelayConfiguration
+    {
+        struct Keys
+        {
+            static constexpr const char* delay
+            {
+                "DelayInMs"
+            };
+        };
+    };
+
+class DelayedProvider : public Provider
+{
+    public:
+        // For integration with the Provider factory
+        static std::string class_name();
+        // Waits for "DelayInMs" from the provided property bundle then
+        // instantiates a new provider instance, populating the configuration object
+        // from the provided property bundle.
+        static DelayedProvider::Ptr create_instance(const ProviderFactory::Configuration&);
+        // Creates a new provider instance from the given configuration.
+        DelayedProvider(const Configuration config = Configuration{});
+};
+}
+}
+}
+}
+}
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_DUMMY_DELAYED_PROVIDER_H_
 
=== modified file 'src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp'
--- src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2014-10-27 21:58:16 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2016-04-05 17:17:30 +0000
@@ -66,8 +66,6 @@
     if (config.count("XTRA_SERVER_3") > 0)
         result.xtra_hosts.push_back(config.get<std::string>("XTRA_SERVER_3"));
 
-    result.timeout = std::chrono::milliseconds{1500};
-
     return result;
 }
 
@@ -333,14 +331,14 @@
     } else
     {
         auto now = location::Clock::now().time_since_epoch();
-        auto thiz = static_cast<android::HardwareAbstractionLayer*>(context);
+        auto ms_since_epoch = std::chrono::duration_cast<std::chrono::milliseconds>(now);
 
         static const int zero_uncertainty = 0;
 
         u_hardware_gps_inject_time(
                     thiz->impl.gps_handle,
-                    now.count(),
-                    now.count(),
+                    ms_since_epoch.count(),
+                    ms_since_epoch.count(),
                     zero_uncertainty);
     }
 }
 
=== modified file 'src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h'
--- src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h	2015-04-22 13:30:04 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h	2016-04-05 17:17:30 +0000
@@ -49,7 +49,7 @@
         /** @brief Timeout on gps xtra download operations. */
         std::chrono::milliseconds timeout
         {
-            5000
+            30000
         };
 
         /** Set of hosts serving GPS xtra data. */
 
=== modified file 'src/location_service/com/ubuntu/location/providers/remote/provider.cpp'
--- src/location_service/com/ubuntu/location/providers/remote/provider.cpp	2015-04-14 18:54:00 +0000
+++ src/location_service/com/ubuntu/location/providers/remote/provider.cpp	2016-04-05 17:17:30 +0000
@@ -23,6 +23,7 @@
 #include <com/ubuntu/location/logging.h>
 
 #include <core/dbus/object.h>
+#include <core/dbus/service_watcher.h>
 #include <core/dbus/signal.h>
 #include <core/dbus/asio/executor.h>
 
@@ -191,6 +192,28 @@
     auto service = dbus::Service::use_service(bus, name);
     auto object = service->object_for_path(path);
 
+    // Check if the service has come up
+    if (!bus->has_owner_for_name(name)) {
+        // If it hasn't wait for it to come up
+        bool valid = false;
+        std::mutex guard;
+        std::condition_variable cv;
+        dbus::DBus daemon(bus);
+        dbus::ServiceWatcher::Ptr service_watcher(
+            daemon.make_service_watcher(name, dbus::DBus::WatchMode::registration));
+
+        service_watcher->service_registered().connect([&valid, &guard, &cv]()
+            {
+                std::unique_lock<std::mutex> ul(guard);
+                valid = true;
+                cv.notify_all();
+            });
+
+        std::unique_lock<std::mutex> ul(guard);
+        if (not cv.wait_for(ul, std::chrono::seconds{30}, [&valid]() { return valid; }))
+            throw std::runtime_error("Remote service failed to start");
+    }
+
     return create_instance_with_config(remote::stub::Configuration{object});
 }
 
 
=== modified file 'src/location_service/com/ubuntu/location/service/daemon.cpp'
--- src/location_service/com/ubuntu/location/service/daemon.cpp	2015-04-16 10:03:29 +0000
+++ src/location_service/com/ubuntu/location/service/daemon.cpp	2016-04-05 17:17:30 +0000
@@ -20,6 +20,9 @@
 #include <com/ubuntu/location/boost_ptree_settings.h>
 #include <com/ubuntu/location/provider_factory.h>
 
+#include <com/ubuntu/location/logging.h>
+#include <com/ubuntu/location/connectivity/dummy_connectivity_manager.h>
+
 #include <com/ubuntu/location/service/default_configuration.h>
 #include <com/ubuntu/location/service/demultiplexing_reporter.h>
 #include <com/ubuntu/location/service/ichnaea_reporter.h>
@@ -30,6 +33,7 @@
 
 #include "program_options.h"
 #include "daemon.h"
+#include "runtime.h"
 
 #include <core/dbus/announcer.h>
 #include <core/dbus/resolver.h>
@@ -37,6 +41,8 @@
 
 #include <core/posix/signal.h>
 
+#include <boost/asio.hpp>
+
 #include <system_error>
 #include <thread>
 
@@ -175,116 +181,55 @@
         trap->stop();
     });
 
-    const location::Configuration empty_provider_configuration;
-
-    std::set<location::Provider::Ptr> instantiated_providers;
-
+    auto runtime = location::service::Runtime::create(4);
+
+    location::service::DefaultConfiguration dc;
+    auto engine = dc.the_engine(std::set<location::Provider::Ptr>{}, dc.the_provider_selection_policy(), config.settings);
     for (const std::string& provider : config.providers)
     {
         std::cout << "Instantiating and configuring: " << provider << std::endl;
 
         try
         {
-            auto p = location::ProviderFactory::instance().create_provider_for_name_with_config(
-                        provider,
-                        config.provider_options.count(provider) > 0 ?
-                            config.provider_options.at(provider) : empty_provider_configuration);
-
-            if (p)
-                instantiated_providers.insert(p);
-            else
-                throw std::runtime_error("Problem instantiating provider");
-
+            auto result = std::async(std::launch::async, [provider, config, engine] {
+                return location::ProviderFactory::instance().create_provider_for_name_with_config(
+                    provider,
+                    config.provider_options.count(provider) > 0 ?
+                        config.provider_options.at(provider) : location::Configuration {},
+                    [engine](Provider::Ptr provider)
+                    {
+                        engine->add_provider(provider);
+                    }
+                );
+            });
         } catch(const std::runtime_error& e)
         {
             std::cerr << "Issue instantiating provider: " << e.what() << std::endl;
         }
     }
 
-    config.incoming->install_executor(dbus::asio::make_executor(config.incoming));
-    config.outgoing->install_executor(dbus::asio::make_executor(config.outgoing));
+    config.incoming->install_executor(dbus::asio::make_executor(config.incoming, runtime->service()));
+    config.outgoing->install_executor(dbus::asio::make_executor(config.outgoing, runtime->service()));
 
-    location::service::DefaultConfiguration dc;
+    runtime->start();
 
     location::service::Implementation::Configuration configuration
     {
         config.incoming,
         config.outgoing,
-        dc.the_engine(instantiated_providers, dc.the_provider_selection_policy(), config.settings),
+        engine,
         dc.the_permission_manager(config.outgoing),
         location::service::Harvester::Configuration
         {
-            location::connectivity::platform_default_manager(),
-            // We submit location/wifi/cell measurements to both
-            // Mozilla's location service and to Ubuntu's own instance.
-            std::make_shared<service::DemultiplexingReporter>(
-            std::initializer_list<service::Harvester::Reporter::Ptr>
-            {
-                std::make_shared<service::ichnaea::Reporter>(
-                     service::ichnaea::Reporter::Configuration
-                     {
-                         "https://location.services.mozilla.com",
-                         "UbuntuLocationService",
-                         "UbuntuLocationService"
-                     }
-                ),
-                std::make_shared<service::ichnaea::Reporter>(
-                     service::ichnaea::Reporter::Configuration
-                     {
-                         "https://162.213.35.107",
-                         "UbuntuLocationService",
-                         "UbuntuLocationService"
-                     }
-                )
-            })
+            std::make_shared<dummy::ConnectivityManager>(),
+            std::make_shared<NullReporter>()
         }
     };
 
     auto location_service = std::make_shared<location::service::Implementation>(configuration);
-    // We need to ensure that any exception raised by the executor does not crash the app
-    // and also gets logged.
-    auto execute = [] (std::shared_ptr<core::dbus::Bus> bus) {
-        while(true)
-        {
-            try
-            {
-                VLOG(10) << "Starting a bus executor";
-                bus->run();
-                break; // run() exited normally
-            }
-            catch (const std::exception& e)
-            {
-                LOG(WARNING) << e.what();
-            }
-            catch (...)
-            {
-                LOG(WARNING) << "Unexpected exception was raised by the bus executor";
-            }
-        }
-    };
-
-    std::thread t1{execute, config.incoming};
-    std::thread t2{execute, config.incoming};
-    std::thread t3{execute, config.incoming};
-    std::thread t4{execute, config.outgoing};
 
     trap->run();
 
-    config.incoming->stop();
-    config.outgoing->stop();
-
-    if (t1.joinable())
-        t1.join();
-
-    if (t2.joinable())
-        t2.join();
-
-    if (t3.joinable())
-        t3.join();
-
-    if (t4.joinable())
-        t4.join();
-
     return EXIT_SUCCESS;
 }
 
 
=== modified file 'src/location_service/com/ubuntu/location/service/implementation.cpp'
--- src/location_service/com/ubuntu/location/service/implementation.cpp	2014-08-13 13:08:22 +0000
+++ src/location_service/com/ubuntu/location/service/implementation.cpp	2016-04-05 17:17:30 +0000
@@ -113,10 +113,13 @@
               {
                   visible_space_vehicles() = svs;
               }),
-          configuration.engine->updates.reference_location.changed().connect(
-              [this](const cul::Update<cul::Position>& update)
+          configuration.engine->updates.last_known_location.changed().connect(
+              [this](const cul::Optional<cul::Update<cul::Position>>& update)
               {
-                  harvester.report_position_update(update);
+                  if (update)
+                  {
+                      harvester.report_position_update(update.get());
+                  }
               })
       }
 {
@@ -149,5 +152,23 @@
         new ProxyProvider{provider_selection}
     };
 
-    return session::Interface::Ptr{new culs::session::Implementation(proxy_provider)};
+    session::Interface::Ptr session_iface{new session::Implementation(proxy_provider)};
+    std::weak_ptr<session::Interface> session_weak{session_iface};
+    session_iface->updates().position_status.changed().connect([this, session_weak](const session::Interface::Updates::Status& status)
+    {
+        cul::Optional<cul::Update<cul::Position>> last_known_position = configuration.engine->updates.last_known_location.get();
+        bool has_last_known_position = last_known_position ? true : false;
+        bool is_session_enabled = status == culs::session::Interface::Updates::Status::enabled;
+        bool is_session_on_or_active = configuration.engine->configuration.engine_state != Engine::Status::off;
+
+        if (has_last_known_position && is_session_enabled && is_session_on_or_active)
+        {
+            // Immediately send the last known position to the client
+            if (auto session_iface = session_weak.lock())
+            {
+                session_iface->updates().position = last_known_position.get();
+            }
+        }
+    });
+    return session_iface;
 }
 
=== modified file 'src/location_service/com/ubuntu/location/service/provider_daemon.cpp'
--- src/location_service/com/ubuntu/location/service/provider_daemon.cpp	2014-10-27 21:58:16 +0000
+++ src/location_service/com/ubuntu/location/service/provider_daemon.cpp	2016-04-05 17:17:30 +0000
@@ -25,6 +25,7 @@
 
 #include <com/ubuntu/location/service/configuration.h>
 #include <com/ubuntu/location/service/program_options.h>
+#include <com/ubuntu/location/service/runtime.h>
 
 #include <core/dbus/asio/executor.h>
 
@@ -65,7 +66,6 @@
     location::service::ProviderDaemon::Configuration result;
 
     result.connection = factory(mutable_daemon_options().bus());
-    result.connection->install_executor(core::dbus::asio::make_executor(result.connection));
 
     auto service = core::dbus::Service::add_service(
                 result.connection,
@@ -108,7 +108,15 @@
     return result;
 }
 
-int location::service::ProviderDaemon::main(const location::service::ProviderDaemon::Configuration& configuration)
+namespace
+{
+std::shared_ptr<location::service::Runtime> runtime()
+{
+    static const auto inst = location::service::Runtime::create(2);
+    return inst;
+}
+}
+int location::service::ProviderDaemon::main(const location::service::ProviderDaemon::Configuration& config)
 {
     auto trap = core::posix::trap_signals_for_all_subsequent_threads(
     {
@@ -121,27 +129,20 @@
         trap->stop();
     });
 
-    std::thread worker
-    {
-        [configuration]()
-        {
-            configuration.connection->run();
-        }
-    };
+    config.connection->install_executor(core::dbus::asio::make_executor(config.connection, runtime()->service()));
 
     auto skeleton = location::providers::remote::skeleton::create_with_configuration(location::providers::remote::skeleton::Configuration
     {
-        configuration.object,
-        configuration.connection,
-        configuration.provider
+        config.object,
+        config.connection,
+        config.provider
     });
 
+    runtime()->start();
+
     trap->run();
 
-    configuration.connection->stop();
-
-    if (worker.joinable())
-        worker.join();
+    config.connection->stop();
 
     return EXIT_SUCCESS;
 }
 
=== added file 'src/location_service/com/ubuntu/location/service/runtime.cpp'
--- src/location_service/com/ubuntu/location/service/runtime.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/service/runtime.cpp	2016-04-05 17:17:30 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTIlocationAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#include <com/ubuntu/location/service/runtime.h>
+
+#include <com/ubuntu/location/logging.h>
+
+namespace culs = com::ubuntu::location::service;
+
+namespace
+{
+// exception_safe_run runs service, catching all exceptions and
+// restarting operation until an explicit shutdown has been requested.
+//
+// TODO(tvoss): Catching all exceptions is risky as they might signal unrecoverable
+// errors. We should enable calling code to decide whether an exception should be considered
+// fatal or not.
+void exception_safe_run(boost::asio::io_service& service)
+{
+    while (true)
+    {
+        try
+        {
+            service.run();
+            // a clean return from run only happens in case of
+            // stop() being called (we are keeping the service alive with
+            // a service::work instance).
+            break;
+        }
+        catch (const std::exception& e)
+        {
+            LOG(WARNING) << e.what();
+        }
+        catch (...)
+        {
+            LOG(WARNING) << "Unknown exception caught while executing boost::asio::io_service";
+        }
+    }
+}
+}
+
+std::shared_ptr<culs::Runtime> culs::Runtime::create(std::uint32_t pool_size)
+{
+    return std::shared_ptr<culs::Runtime>(new culs::Runtime(pool_size));
+}
+
+culs::Runtime::Runtime(std::uint32_t pool_size)
+    : pool_size_{pool_size},
+      service_{pool_size_},
+      strand_{service_},
+      keep_alive_{service_}
+{
+}
+
+culs::Runtime::~Runtime()
+{
+    try
+    {
+        stop();
+    } catch(...)
+    {
+        // Dropping all exceptions to satisfy the nothrow guarantee.
+    }
+}
+
+void culs::Runtime::start()
+{
+    for (unsigned int i = 0; i < pool_size_; i++)
+        workers_.push_back(std::thread{exception_safe_run, std::ref(service_)});
+}
+
+void culs::Runtime::stop()
+{
+    service_.stop();
+
+    for (auto& worker : workers_)
+        if (worker.joinable())
+            worker.join();
+}
+
+std::function<void(std::function<void()>)> culs::Runtime::to_dispatcher_functional()
+{
+    // We have to make sure that we stay alive for as long as
+    // calling code requires the dispatcher to work.
+    auto sp = shared_from_this();
+    return [sp](std::function<void()> task)
+    {
+        sp->strand_.post(task);
+    };
+}
+
+boost::asio::io_service& culs::Runtime::service()
+{
+    return service_;
+}
 
=== added file 'src/location_service/com/ubuntu/location/service/runtime.h'
--- src/location_service/com/ubuntu/location/service/runtime.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/service/runtime.h	2016-04-05 17:17:30 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTIlocationAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef COM_UBUNTU_LOCATION_SERVICE_RUNTIME_H_
+#define COM_UBUNTU_LOCATION_SERVICE_RUNTIME_H_
+
+#include <boost/asio.hpp>
+
+#include <functional>
+#include <memory>
+#include <thread>
+#include <vector>
+
+#include <cstdint>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+namespace service
+{
+// We bundle our "global" runtime dependencies here, specifically
+// a dispatcher to decouple multiple in-process providers from one
+// another , forcing execution to a well known set of threads.
+class Runtime : public std::enable_shared_from_this<Runtime>
+{
+public:
+    // Our default concurrency setup.
+    static constexpr const std::uint32_t worker_threads = 2;
+
+    // create returns a Runtime instance with pool_size worker threads
+    // executing the underlying service.
+    static std::shared_ptr<Runtime> create(std::uint32_t pool_size = worker_threads);
+
+    Runtime(const Runtime&) = delete;
+    Runtime(Runtime&&) = delete;
+    // Tears down the runtime, stopping all worker threads.
+    ~Runtime() noexcept(true);
+    Runtime& operator=(const Runtime&) = delete;
+    Runtime& operator=(Runtime&&) = delete;
+
+    // start executes the underlying io_service on a thread pool with
+    // the size configured at creation time.
+    void start();
+
+    // stop cleanly shuts down a Runtime instance,
+    // joining all worker threads.
+    void stop();
+
+    // to_dispatcher_functional returns a function for integration 
+    // with components that expect a dispatcher for operation. 
+    std::function<void(std::function<void()>)> to_dispatcher_functional();
+
+    // service returns the underlying boost::asio::io_service that is executed
+    // by the Runtime.
+    boost::asio::io_service& service();
+
+private:
+    // Runtime constructs a new instance, firing up pool_size 
+    // worker threads.
+    Runtime(std::uint32_t pool_size);
+
+    std::uint32_t pool_size_;
+    boost::asio::io_service service_;
+    boost::asio::io_service::strand strand_;
+    boost::asio::io_service::work keep_alive_;
+    std::vector<std::thread> workers_;
+};
+}
+}
+}
+}
+
+#endif // COM_UBUNTU_LOCATION_SERVICE_RUNTIME_H_
 
=== modified file 'src/location_service/com/ubuntu/location/service/session/skeleton.cpp'
--- src/location_service/com/ubuntu/location/service/session/skeleton.cpp	2014-08-14 20:31:09 +0000
+++ src/location_service/com/ubuntu/location/service/session/skeleton.cpp	2016-04-05 17:17:30 +0000
@@ -283,7 +283,13 @@
     VLOG(10) << __PRETTY_FUNCTION__;
     try
     {
-        configuration.remote.object->invoke_method_asynchronously<culs::session::Interface::UpdatePosition, void>(position);
+        configuration.remote.object->invoke_method_asynchronously_with_callback<culs::session::Interface::UpdatePosition, void>([](const core::dbus::Result<void>& result)
+        {
+            if (result.is_error())
+            {
+                LOG(INFO) << "Failed to communicate position update to client: " << result.error().print();    
+            }
+        }, position);
     } catch(const std::exception&)
     {
         // We consider the session to be dead once we hit an exception here.
@@ -300,7 +306,13 @@
     VLOG(10) << __PRETTY_FUNCTION__;
     try
     {
-        configuration.remote.object->invoke_method_asynchronously<culs::session::Interface::UpdateHeading, void>(heading);
+        configuration.remote.object->invoke_method_asynchronously_with_callback<culs::session::Interface::UpdateHeading, void>([](const core::dbus::Result<void>& result)
+        {
+            if (result.is_error())
+            {
+                LOG(INFO) << "Failed to communicate position update to client: " << result.error().print();    
+            }
+        }, heading);
     } catch(const std::exception&)
     {
         // We consider the session to be dead once we hit an exception here.
@@ -317,7 +329,13 @@
     VLOG(10) << __PRETTY_FUNCTION__;
     try
     {
-        configuration.remote.object->invoke_method_asynchronously<culs::session::Interface::UpdateVelocity, void>(velocity);
+        configuration.remote.object->invoke_method_asynchronously_with_callback<culs::session::Interface::UpdateVelocity, void>([](const core::dbus::Result<void>& result)
+        {
+            if (result.is_error())
+            {
+                LOG(INFO) << "Failed to communicate position update to client: " << result.error().print();    
+            }
+        }, velocity);
     } catch(const std::exception&)
     {
         // We consider the session to be dead once we hit an exception here.
 
=== modified file 'src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp'
--- src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2014-09-19 14:36:51 +0000
+++ src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2016-04-05 17:17:30 +0000
@@ -146,7 +146,7 @@
         return service::PermissionManager::Result::rejected;
     }
 
-    std::string description = i18n::tr("%1% wants to access your current location.");
+    std::string description = i18n::tr("wants to access your current location.");
 
     core::trust::Agent::RequestParameters params
     {
 
=== modified file 'src/location_service/com/ubuntu/location/time_based_update_policy.cpp'
--- src/location_service/com/ubuntu/location/time_based_update_policy.cpp	2015-04-23 21:30:04 +0000
+++ src/location_service/com/ubuntu/location/time_based_update_policy.cpp	2016-04-05 17:17:30 +0000
@@ -53,8 +53,9 @@
     {
         // if the update has happened within a reasonable amount of time we will just use it if it is more accurate
         // that the previous one.
-        use_new_update = last_position_update.value.accuracy.horizontal && update.value.accuracy.horizontal
-            && *last_position_update.value.accuracy.horizontal >= *update.value.accuracy.horizontal;
+        use_new_update = !last_position_update.value.accuracy.horizontal ||
+            (update.value.accuracy.horizontal
+             && *last_position_update.value.accuracy.horizontal >= *update.value.accuracy.horizontal);
     }
 
     if (use_new_update)
@@ -118,4 +119,4 @@
 
 }
 }
-}
 \ No newline at end of file
+}
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-04-23 17:04:09 +0000
+++ tests/CMakeLists.txt	2016-04-05 17:17:30 +0000
@@ -92,6 +92,7 @@
 LOCATION_SERVICE_ADD_TEST(provider_test provider_test.cpp)
 LOCATION_SERVICE_ADD_TEST(wgs84_test wgs84_test.cpp)
 LOCATION_SERVICE_ADD_TEST(trust_store_permission_manager_test trust_store_permission_manager_test.cpp)
+LOCATION_SERVICE_ADD_TEST(runtime_test runtime_test.cpp)
 
 # Provider-specific test-cases go here.
 if (LOCATION_SERVICE_ENABLE_GPS_PROVIDER)
@@ -124,3 +125,4 @@
 
 LOCATION_SERVICE_ADD_TEST(remote_provider_test remote_provider_test.cpp)
 LOCATION_SERVICE_ADD_TEST(espoo_provider_test espoo_provider_test.cpp)
+LOCATION_SERVICE_ADD_TEST(delayed_service_test delayed_service_test.cpp)
 
=== modified file 'tests/acceptance_tests.cpp'
--- tests/acceptance_tests.cpp	2015-02-13 13:19:18 +0000
+++ tests/acceptance_tests.cpp	2016-04-05 17:17:30 +0000
@@ -38,12 +38,14 @@
 #include <com/ubuntu/location/service/stub.h>
 
 #include <core/dbus/announcer.h>
+#include <core/dbus/bus.h>
 #include <core/dbus/fixture.h>
 #include <core/dbus/resolver.h>
 
 #include <core/dbus/asio/executor.h>
 
 #include <core/posix/signal.h>
+#include <core/posix/this_process.h>
 
 #include <core/testing/cross_process_sync.h>
 #include <core/testing/fork_and_run.h>
@@ -663,6 +665,110 @@
     EXPECT_EQ(core::testing::ForkAndRunResult::empty, core::testing::fork_and_run(server, client));
 }
 
+TEST_F(LocationServiceStandalone, NewSessionsGetLastKnownPosition)
+{
+    core::testing::CrossProcessSync sync_start;
+
+    auto server = [this, &sync_start]()
+    {
+        SCOPED_TRACE("Server");
+
+        auto trap = core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_term});
+        trap->signal_raised().connect([trap](core::posix::Signal)
+        {
+            trap->stop();
+        });
+
+        auto incoming = session_bus();
+        auto outgoing = session_bus();
+
+        incoming->install_executor(core::dbus::asio::make_executor(incoming));
+        outgoing->install_executor(core::dbus::asio::make_executor(outgoing));
+
+        auto dummy = new DummyProvider();
+        cul::Provider::Ptr helper(dummy);
+
+        cul::service::DefaultConfiguration config;
+        cul::service::Implementation::Configuration configuration
+        {
+            incoming,
+            outgoing,
+            config.the_engine(config.the_provider_set(helper), config.the_provider_selection_policy(), null_settings()),
+            config.the_permission_manager(incoming),
+            cul::service::Harvester::Configuration
+            {
+                cul::connectivity::platform_default_manager(),
+                std::make_shared<NullReporter>()
+            }
+        };
+        auto location_service = std::make_shared<cul::service::Implementation>(configuration);
+
+        configuration.engine->updates.last_known_location.set(reference_position_update);
+        std::thread t1{[incoming](){incoming->run();}};
+        std::thread t2{[outgoing](){outgoing->run();}};
+
+        sync_start.try_signal_ready_for(std::chrono::milliseconds{500});
+
+        trap->run();
+
+        incoming->stop();
+        outgoing->stop();
+
+        if (t1.joinable())
+            t1.join();
+
+        if (t2.joinable())
+            t2.join();
+
+        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
+    };
+
+    auto client = [this, &sync_start]()
+    {
+        SCOPED_TRACE("Client");
+
+        EXPECT_EQ(1, sync_start.wait_for_signal_ready_for(std::chrono::milliseconds{500}));
+
+        auto bus = session_bus();
+        bus->install_executor(dbus::asio::make_executor(bus));
+        std::thread t{[bus](){bus->run();}};
+
+        auto location_service = dbus::resolve_service_on_bus<
+            cul::service::Interface,
+            cul::service::Stub>(bus);
+
+        auto s1 = location_service->create_session_for_criteria(cul::Criteria{});
+
+        std::cout << "Successfully created session" << std::endl;
+
+        cul::Update<cul::Position> position;
+        auto c1 = s1->updates().position.changed().connect(
+            [&](const cul::Update<cul::Position>& new_position) {
+                std::cout << "On position updated: " << new_position << std::endl;
+                position = new_position;
+            });
+
+        std::cout << "Created event connections, starting updates..." << std::endl;
+
+        s1->updates().position_status = culss::Interface::Updates::Status::enabled;
+
+        std::cout << "done" << std::endl;
+
+        std::this_thread::sleep_for(std::chrono::milliseconds{1000});
+
+        bus->stop();
+
+        if (t.joinable())
+            t.join();
+
+        EXPECT_EQ(reference_position_update, position);
+
+        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
+    };
+
+    EXPECT_EQ(core::testing::ForkAndRunResult::empty, core::testing::fork_and_run(server, client));
+}
+
 namespace
 {
 struct LocationServiceStandaloneLoad : public LocationServiceStandalone
@@ -708,7 +814,7 @@
 
         options.add(Keys::update_period,
                     "Update period length for dummy::Provider setup.",
-                    std::uint32_t{100});
+                    std::uint32_t{10});
 
         options.add(Keys::client_count,
                     "Number of clients that should be fired up.",
@@ -761,6 +867,8 @@
 };
 }
 
+#include "did_finish_successfully.h"
+
 TEST_F(LocationServiceStandaloneLoad, MultipleClientsConnectingAndDisconnectingWorks)
 {
     EXPECT_TRUE(trust_store_is_set_up_for_testing);
@@ -801,8 +909,8 @@
         };
 
         cul::service::Daemon::Configuration config;
-        config.incoming = session_bus();
-        config.outgoing = session_bus();
+        config.incoming = std::make_shared<core::dbus::Bus>(core::posix::this_process::env::get_or_throw("DBUS_SESSION_BUS_ADDRESS"));
+        config.outgoing = std::make_shared<core::dbus::Bus>(core::posix::this_process::env::get_or_throw("DBUS_SESSION_BUS_ADDRESS"));
         config.is_testing_enabled = false;
         config.providers =
         {
@@ -829,7 +937,7 @@
                     status;
     }, core::posix::StandardStream::empty);
 
-    std::this_thread::sleep_for(std::chrono::seconds{2});
+    std::this_thread::sleep_for(std::chrono::seconds{15});
 
     auto client = [this]()
     {
@@ -957,17 +1065,11 @@
     {
         VLOG(1) << "Stopping client...: " << client.pid();
         client.send_signal_or_throw(core::posix::Signal::sig_term);
-        auto result = client.wait_for(core::posix::wait::Flags::untraced);
-
-        EXPECT_EQ(core::posix::wait::Result::Status::exited, result.status);
-        EXPECT_EQ(core::posix::exit::Status::success, result.detail.if_exited.status);
+        EXPECT_TRUE(did_finish_successfully(client.wait_for(core::posix::wait::Flags::untraced)));
     }
 
     VLOG(1) << "Cleaned up clients, shutting down the service...";
 
     server.send_signal_or_throw(core::posix::Signal::sig_term);
-    auto result = server.wait_for(core::posix::wait::Flags::untraced);
-
-    EXPECT_EQ(core::posix::wait::Result::Status::exited, result.status);
-    EXPECT_EQ(core::posix::exit::Status::success, result.detail.if_exited.status);
+    EXPECT_TRUE(did_finish_successfully(server.wait_for(core::posix::wait::Flags::untraced)));
 }
 
=== added file 'tests/delayed_service_test.cpp'
--- tests/delayed_service_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/delayed_service_test.cpp	2016-04-05 17:17:30 +0000
@@ -0,0 +1,193 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ *              Scott Sweeny <[e-mail]>
+ */
+
+#include <com/ubuntu/location/service/daemon.h>
+#include <com/ubuntu/location/service/provider_daemon.h>
+#include <com/ubuntu/location/providers/remote/provider.h>
+
+#include <com/ubuntu/location/service/stub.h>
+
+#include <com/ubuntu/location/position.h>
+#include <com/ubuntu/location/update.h>
+
+#include <core/dbus/fixture.h>
+
+#include <core/dbus/asio/executor.h>
+
+#include <core/posix/fork.h>
+#include <core/posix/signal.h>
+#include <core/posix/this_process.h>
+
+#include "did_finish_successfully.h"
+#include "mock_event_receiver.h"
+
+#include <gmock/gmock.h>
+
+namespace location = com::ubuntu::location;
+namespace remote = com::ubuntu::location::providers::remote;
+
+namespace
+{
+struct DelayedServiceTest : public core::dbus::testing::Fixture, public ::testing::WithParamInterface<int>
+{
+
+};
+}
+
+TEST_P(DelayedServiceTest, AClientReceivesUpdatesFromADelayedProvider)
+{
+    auto oopp = core::posix::fork([this]()
+    {
+        auto bus = session_bus();
+
+        // Pass the delay value to the provider
+        char delay[50];
+        sprintf(delay, "--dummy::DelayedProvider::DelayInMs=%d", GetParam());
+
+        const char* argv[] =
+        {
+            "--bus", "session",                                         // 2
+            "--service-name", "com.ubuntu.location.providers.Dummy",    // 4
+            "--service-path", "/com/ubuntu/location/providers/Dummy",   // 6
+            "--provider", "dummy::DelayedProvider",                     // 8
+            delay                                                       // 9
+        };
+
+        auto dbus_connection_factory = [bus](core::dbus::WellKnownBus)
+        {
+            return bus;
+        };
+
+        return static_cast<core::posix::exit::Status>(
+                    location::service::ProviderDaemon::main(
+                        location::service::ProviderDaemon::Configuration::from_command_line_args(
+                            9, argv, dbus_connection_factory)));
+    }, core::posix::StandardStream::empty);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds{250});
+
+    auto service = core::posix::fork([this]()
+    {
+        core::posix::this_process::env::set_or_throw(
+                    "TRUST_STORE_PERMISSION_MANAGER_IS_RUNNING_UNDER_TESTING",
+                    "1");
+
+        const char* argv[] =
+        {
+            "--bus", "session",                                                 // 2
+            "--provider", "remote::Provider",                                   // 4
+            "--remote::Provider::bus=session_with_address_from_env",            // 5
+            "--remote::Provider::name=com.ubuntu.location.providers.Dummy",     // 6
+            "--remote::Provider::path=/com/ubuntu/location/providers/Dummy"     // 7
+        };
+
+        // The daemon instance requires two bus instances.
+        auto dbus_connection_factory = [this](core::dbus::WellKnownBus)
+        {
+            return session_bus();
+        };
+
+        return static_cast<core::posix::exit::Status>(
+                    location::service::Daemon::main(
+                        location::service::Daemon::Configuration::from_command_line_args(
+                            7, argv, dbus_connection_factory)));
+    }, core::posix::StandardStream::empty);
+
+    // Wait to setup the client until the service is up
+    std::this_thread::sleep_for(std::chrono::milliseconds{250 + GetParam()});
+
+    auto client = core::posix::fork([this]()
+    {
+        using namespace ::testing;
+
+        auto trap = core::posix::trap_signals_for_all_subsequent_threads(
+        {
+            core::posix::Signal::sig_term,
+            core::posix::Signal::sig_int
+        });
+
+        trap->signal_raised().connect([trap](const core::posix::Signal&)
+        {
+            trap->stop();
+        });
+
+        auto bus = session_bus();
+        bus->install_executor(core::dbus::asio::make_executor(bus));
+
+        std::thread worker
+        {
+            [bus]() { bus->run(); }
+        };
+
+        MockEventReceiver receiver;
+        EXPECT_CALL(receiver, position_update_received(_)).Times(AtLeast(1));
+        EXPECT_CALL(receiver, heading_update_received(_)).Times(AtLeast(1));
+        EXPECT_CALL(receiver, velocity_update_received(_)).Times(AtLeast(1));
+
+        com::ubuntu::location::service::Stub service{bus};
+
+        auto session = service.create_session_for_criteria(location::Criteria{});
+
+        session->updates().position.changed().connect([&receiver](location::Update<location::Position> pos)
+        {
+             receiver.position_update_received(pos);
+        });
+
+        session->updates().heading.changed().connect([&receiver](location::Update<location::Heading> heading)
+        {
+             receiver.heading_update_received(heading);
+        });
+
+        session->updates().velocity.changed().connect([&receiver](location::Update<location::Velocity> velocity)
+        {
+             receiver.velocity_update_received(velocity);
+        });
+
+        session->updates().position_status = location::service::session::Interface::Updates::Status::enabled;
+        session->updates().velocity_status = location::service::session::Interface::Updates::Status::enabled;
+        session->updates().heading_status = location::service::session::Interface::Updates::Status::enabled;
+
+        trap->run();
+
+        bus->stop();
+
+        if (worker.joinable())
+            worker.join();
+
+        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure :
+                                               core::posix::exit::Status::success;
+    }, core::posix::StandardStream::empty);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds{4000});
+
+    std::cout << "Shutting down client" << std::endl;
+    client.send_signal_or_throw(core::posix::Signal::sig_term);
+    EXPECT_TRUE(did_finish_successfully(client.wait_for(core::posix::wait::Flags::untraced)));
+
+    std::cout << "Shutting down service" << std::endl;
+    service.send_signal_or_throw(core::posix::Signal::sig_term);
+    EXPECT_TRUE(did_finish_successfully(service.wait_for(core::posix::wait::Flags::untraced)));
+
+    std::cout << "Shutting down oopp" << std::endl;
+    oopp.send_signal_or_throw(core::posix::Signal::sig_term);
+    EXPECT_TRUE(did_finish_successfully(oopp.wait_for(core::posix::wait::Flags::untraced)));
+}
+
+INSTANTIATE_TEST_CASE_P(ServiceDelays, DelayedServiceTest,
+                        ::testing::Values(0, 250, 500, 1000, 2000, 5000, 10000));
 
=== modified file 'tests/engine_test.cpp'
--- tests/engine_test.cpp	2015-01-21 20:04:56 +0000
+++ tests/engine_test.cpp	2016-04-05 17:17:30 +0000
@@ -154,9 +154,9 @@
     EXPECT_CALL(*provider, on_reference_velocity_updated(_)).Times(1);
 
     engine.configuration.wifi_and_cell_id_reporting_state = location::WifiAndCellIdReportingState::on;
-    engine.updates.reference_location = location::Update<location::Position>{};
-    engine.updates.reference_heading = location::Update<location::Heading>{};
-    engine.updates.reference_velocity = location::Update<location::Velocity>{};
+    engine.updates.last_known_location = location::Update<location::Position>{};
+    engine.updates.last_known_heading = location::Update<location::Heading>{};
+    engine.updates.last_known_velocity = location::Update<location::Velocity>{};
 }
 
 /* TODO(tvoss): We have to disable these tests as the MP is being refactored to not break ABI.
@@ -273,13 +273,9 @@
     auto selection_policy = std::make_shared<NiceMock<MockProviderSelectionPolicy>>();
 
     EXPECT_CALL(*settings, has_value_for_key(_))
-            .Times(3)
+            .Times(2)
             .WillRepeatedly(Return(true));
     EXPECT_CALL(*settings, get_string_for_key_or_throw(
-                    location::Engine::Configuration::Keys::satellite_based_positioning_state))
-            .Times(1)
-            .WillRepeatedly(Return(ss_satellite_based_positioning_state.str()));
-    EXPECT_CALL(*settings, get_string_for_key_or_throw(
                     location::Engine::Configuration::Keys::wifi_and_cell_id_reporting_state))
             .Times(1)
             .WillRepeatedly(Return(ss_wifi_and_cell_id_reporting_state.str()));
@@ -299,11 +295,6 @@
     auto selection_policy = std::make_shared<NiceMock<MockProviderSelectionPolicy>>();
 
     EXPECT_CALL(*settings, set_string_for_key(
-                    location::Engine::Configuration::Keys::satellite_based_positioning_state,
-                    _))
-            .Times(1)
-            .WillRepeatedly(Return(true));
-    EXPECT_CALL(*settings, set_string_for_key(
                     location::Engine::Configuration::Keys::wifi_and_cell_id_reporting_state,
                     _))
             .Times(1)
 
=== modified file 'tests/gps_provider_test.cpp'
--- tests/gps_provider_test.cpp	2015-01-12 08:41:14 +0000
+++ tests/gps_provider_test.cpp	2016-04-05 17:17:30 +0000
@@ -48,6 +48,31 @@
 
 namespace
 {
+
+struct MockHardwareGps
+{
+    MockHardwareGps()
+    {
+        instance_ = this;
+    }
+    ~MockHardwareGps()
+    {
+        instance_ = nullptr;
+    }
+
+    MOCK_METHOD5(set_position_mode, bool(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t));
+    MOCK_METHOD3(inject_time, void(int64_t, int64_t, int));
+
+    static MockHardwareGps *mocked(UHardwareGps self) {
+        return reinterpret_cast<MockHardwareGps*>(self);
+    }
+    static MockHardwareGps *instance() { return instance_; }
+
+    static MockHardwareGps *instance_;
+};
+
+MockHardwareGps *MockHardwareGps::instance_ = nullptr;
+
 struct UpdateTrap
 {
     MOCK_METHOD1(on_position_updated, void(const location::Position&));
@@ -211,6 +236,42 @@
 
 }
 
+/* Mock the hardware GPS platform API: the methods defined here will be invoked
+ * instead of those exported by the system library.
+ * We redefine these methods using the MockHardwareGps class above, which is
+ * implemented using google-mock. This effectively allows us to test that the
+ * right calls to the platform API are made.
+ */
+UHardwareGps
+u_hardware_gps_new(UHardwareGpsParams *)
+{
+    using namespace ::testing;
+
+    return reinterpret_cast<UHardwareGps>(MockHardwareGps::instance());
+}
+
+void
+u_hardware_gps_delete(UHardwareGps)
+{
+}
+
+bool
+u_hardware_gps_set_position_mode(UHardwareGps self, uint32_t mode, uint32_t recurrence,
+                                 uint32_t min_interval, uint32_t preferred_accuracy,
+                                 uint32_t preferred_time)
+{
+    MockHardwareGps *thiz = MockHardwareGps::mocked(self);
+    return thiz->set_position_mode(mode, recurrence, min_interval,
+                                   preferred_accuracy, preferred_time);
+}
+
+void
+u_hardware_gps_inject_time(UHardwareGps self, int64_t time, int64_t time_reference, int uncertainty)
+{
+    MockHardwareGps* thiz = MockHardwareGps::mocked(self);
+    return thiz->inject_time(time, time_reference, uncertainty);
+}
+
 TEST(AndroidGpsXtraDownloader, reading_configuration_from_valid_conf_file_works)
 {
     std::stringstream ss{gps_conf};
@@ -261,6 +322,28 @@
     provider.on_reference_location_updated(pos);
 }
 
+TEST(GpsProvider, time_requests_inject_current_time_into_the_hal)
+{
+    using namespace ::testing;
+
+    NiceMock<MockHardwareGps> hardwareGps;
+
+    gps::android::HardwareAbstractionLayer::Configuration configuration;
+    gps::android::HardwareAbstractionLayer hal(configuration);
+    std::shared_ptr<gps::HardwareAbstractionLayer> hal_ptr(&hal, [](gps::HardwareAbstractionLayer*){});
+
+    gps::Provider provider(hal_ptr);
+    int64_t time = 0;
+    EXPECT_CALL(hardwareGps, inject_time(_, _, 0)).Times(1).WillOnce(SaveArg<0>(&time));
+
+    auto t0 = std::chrono::duration_cast<std::chrono::milliseconds>(location::Clock::now().time_since_epoch());
+
+    gps::android::HardwareAbstractionLayer::on_request_utc_time(&hal);
+
+    auto t1 = std::chrono::duration_cast<std::chrono::milliseconds>(location::Clock::now().time_since_epoch());
+    EXPECT_THAT(time, AllOf(Ge(t0.count()), Le(t1.count())));
+}
+
 TEST(GpsProvider, updates_from_hal_are_passed_on_by_the_provider)
 {
     using namespace ::testing;
 
=== added file 'tests/mock_event_receiver.h'
--- tests/mock_event_receiver.h	1970-01-01 00:00:00 +0000
+++ tests/mock_event_receiver.h	2016-04-05 17:17:30 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ *              Scott Sweeny <[e-mail]>
+ */
+#ifndef MOCK_EVENT_RECEIVER_H_
+#define MOCK_EVENT_RECEIVER_H_
+
+#include <com/ubuntu/location/update.h>
+
+#include <gmock/gmock.h>
+
+namespace location = com::ubuntu::location;
+
+struct MockEventReceiver
+{
+    MOCK_METHOD1(position_update_received, void(const location::Update<location::Position>&));
+    MOCK_METHOD1(heading_update_received, void(const location::Update<location::Heading>&));
+    MOCK_METHOD1(velocity_update_received, void(const location::Update<location::Velocity>&));
+};
+
+#endif // MOCK_EVENT_RECEIVER_H_
 
=== modified file 'tests/position_test.cpp'
--- tests/position_test.cpp	2014-06-20 07:40:34 +0000
+++ tests/position_test.cpp	2016-04-05 17:17:30 +0000
@@ -40,7 +40,7 @@
         cul::wgs84::Latitude{},
         cul::wgs84::Longitude{},
         cul::wgs84::Altitude{}};
-    EXPECT_TRUE(p.altitude);
+    EXPECT_TRUE(p.altitude ? true : false);
 }
 
 #include <com/ubuntu/location/codec.h>
 
=== modified file 'tests/remote_providerd_test.cpp'
--- tests/remote_providerd_test.cpp	2014-10-27 21:58:16 +0000
+++ tests/remote_providerd_test.cpp	2016-04-05 17:17:30 +0000
@@ -31,6 +31,7 @@
 #include <core/posix/fork.h>
 
 #include "did_finish_successfully.h"
+#include "mock_event_receiver.h"
 
 #include <gmock/gmock.h>
 
@@ -38,13 +39,6 @@
 
 namespace
 {
-struct MockEventReceiver
-{
-    MOCK_METHOD1(position_update_received, void(const location::Update<location::Position>&));
-    MOCK_METHOD1(heading_update_received, void(const location::Update<location::Heading>&));
-    MOCK_METHOD1(velocity_update_received, void(const location::Update<location::Velocity>&));
-};
-
 struct RemoteProviderdTest : public core::dbus::testing::Fixture
 {
 
 
=== added file 'tests/runtime_test.cpp'
--- tests/runtime_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/runtime_test.cpp	2016-04-05 17:17:30 +0000
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2015Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#include <com/ubuntu/location/service/runtime.h>
+
+#include <gtest/gtest.h>
+
+#include <condition_variable>
+#include <thread>
+
+namespace culs = com::ubuntu::location::service;
+
+TEST(Runtime, cleanly_shuts_down_threads)
+{
+    culs::Runtime::create();
+}
+
+TEST(Runtime, executes_service)
+{
+    std::mutex m;
+    std::unique_lock<std::mutex> ul{m};
+    std::condition_variable wc;
+
+    bool signaled = false;
+
+    auto rt = culs::Runtime::create();
+    rt->start();
+    boost::asio::deadline_timer timer{rt->service(), boost::posix_time::milliseconds(500)};
+    timer.async_wait([&wc, &signaled](const boost::system::error_code&)
+    {
+        signaled = true;
+        wc.notify_all();
+    });
+
+    auto result = wc.wait_for(ul, std::chrono::seconds{1}, [&signaled]() { return signaled; });
+    EXPECT_TRUE(result);
+}
+
+TEST(Runtime, catches_exceptions_thrown_from_handlers)
+{
+    std::mutex m;
+    std::unique_lock<std::mutex> ul{m};
+    std::condition_variable wc;
+
+    bool signaled = false;
+
+    auto rt = culs::Runtime::create();
+    rt->start();
+    boost::asio::deadline_timer fast{rt->service(), boost::posix_time::milliseconds(100)};
+    fast.async_wait([](const boost::system::error_code&)
+    {
+        throw std::runtime_error{"Should not propagate"};
+    });
+
+    boost::asio::deadline_timer slow{rt->service(), boost::posix_time::milliseconds(500)};
+    slow.async_wait([&wc, &signaled](const boost::system::error_code&)
+    {
+        signaled = true;
+        wc.notify_all();
+    });
+
+    auto result = wc.wait_for(ul, std::chrono::seconds{1}, [&signaled]() { return signaled; });
+    EXPECT_TRUE(result);
+}
+
+// sets_up_pool_of_threads ensures that the pool size 
+// passed to the Runtime on construction is honored. The idea is simple:
+// We set up two deadline timers, fast and slow. fast fires before slow,
+// with fast blocking in a wait on a common condition_variable. When slow 
+// fires, it notifies the condition variable, thereby unblocking the handler of fast,
+// enabling clean shutdown without errors and timeouts. This only works if the 
+// pool contains at least 2 threads. Otherwise, the handler of slow would not be executed
+// until the handler of fast times out in the wait, marking the test as failed.
+TEST(Runtime, sets_up_pool_of_threads)
+{
+    struct State
+    {
+        bool signaled{false};
+        std::mutex m;
+        std::condition_variable wc;
+    };
+
+    auto state = std::make_shared<State>();
+
+    auto rt = culs::Runtime::create(2);
+    rt->start();
+    boost::asio::deadline_timer fast{rt->service(), boost::posix_time::milliseconds(100)};
+    fast.async_wait([state](const boost::system::error_code&)
+    {
+        std::unique_lock<std::mutex> ul{state->m};
+        EXPECT_TRUE(state->wc.wait_for(ul, std::chrono::seconds{1}, [state]() { return state->signaled; }));
+    });
+
+    boost::asio::deadline_timer slow{rt->service(), boost::posix_time::milliseconds(500)};
+    slow.async_wait([state](const boost::system::error_code&)
+    {
+        state->signaled = true;
+        state->wc.notify_all();
+    });
+
+    std::unique_lock<std::mutex> ul{state->m};
+    auto result = state->wc.wait_for(ul, std::chrono::seconds{1}, [state]() { return state->signaled; });
+    EXPECT_TRUE(result);
+}
 
=== added directory 'tools'
=== added file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tools/CMakeLists.txt	2016-04-05 17:17:30 +0000
@@ -0,0 +1,1 @@
+configure_file(symbol_diff.in symbol_diff)
 
=== added file 'tools/symbol_diff.in'
--- tools/symbol_diff.in	1970-01-01 00:00:00 +0000
+++ tools/symbol_diff.in	2016-04-05 17:17:30 +0000
@@ -0,0 +1,70 @@
+#! /usr/bin/env python3
+
+#
+# Copyright (C) 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Michi Henning <[e-mail]>
+#
+
+import re
+import subprocess
+
+OLD_FILE = './debian/libubuntu-location-service@UBUNTU_LOCATION_SERVICE_VERSION_MAJOR@.symbols'
+NEW_FILE = './debian/libubuntu-location-service@UBUNTU_LOCATION_SERVICE_VERSION_MAJOR@/DEBIAN/symbols'
+
+def run():
+    old_regex = re.compile(r'^ (\(.*\))"(.*)" (.*)$')
+
+    old_syms = {}                                   # Dictionary containing symbol -> ( tag, version )
+    with open(OLD_FILE, encoding='utf=8') as file:
+        file.readline()                             # Skip first line, which is the library name and version
+        for line in file:
+            mo = old_regex.match(line)
+            if mo:
+                old_syms[mo.group(2)] = ( mo.group(1), mo.group(3) )
+            else:
+                raise Exception('Invalid input line in ' + OLD_FILE + ': ' + line)
+
+    new_regex = re.compile(r'^ (.*) .+$')
+
+    # Run the new symbols file through "c++filt | sort | uniq". We need
+    # the sort | uniq because, otherwise, we end up with duplicate demangled symbols.
+    with open(NEW_FILE) as infile, open('new_symbols', 'w') as outfile:
+        p = subprocess.Popen(['c++filt | sort | uniq'], shell=True, stdin=infile, stdout=subprocess.PIPE)
+
+        # For each symbol, if it is in the old dictionary, output the tags from the original
+        # symbol file, followed by the symbol and version. Otherwise, use "(c++)" as the tag
+        # and add " 0replaceme", so the new symbol will be accepted.
+        line = p.stdout.readline().decode('utf-8')
+        outfile.write(line)                         # Write library name and version
+        for line in p.stdout:
+            mo = new_regex.match(line.decode('utf-8'))
+            if (mo):
+                sym = mo.group(1)
+                try:
+                    tag, version = old_syms[sym]
+                except KeyError:
+                    tag = '(c++)'
+                    version = '0replaceme'
+                outfile.write(' {}"{}" {}\n'.format(tag, sym, version))
+            else:
+                raise Exception('Cannot parse demangled line: ' + line)
+
+    # Write the diff into /tmp/symbols.diff
+    with open('/tmp/symbols.diff', 'w') as outfile:
+        subprocess.call(['diff', '-u', OLD_FILE, 'new_symbols'], stdout=outfile)
+
+if __name__ == '__main__':
+    run()