Merge lp:~thomas-voss/location-service/fix-1447161 into lp:location-service/trunk

[Thomas Voß]

Increase default timeout for downloading gps xtra data.

Increase default timeout for downloading gps xtra data.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/location-service-ci/359/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/31

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/359/rebuild

review: Approve (continuous-integration)

=== 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	2014-06-23 07:47:27 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h	2015-04-22 14:01:01 +0000
@@ -49,7 +49,7 @@
         /** @brief Timeout on gps xtra download operations. */
         std::chrono::milliseconds timeout
         {
-            1500
+            5000
         };
 
         /** Set of hosts serving GPS xtra data. */