Merge lp:~thomas-voss/location-service/adjust-default-timeout-for-gps-xtra-download into lp:location-service/15.04

[Thomas Voß]

Adjust default timeout for downloading GPS XTRA data.

30 seconds are perfectly fine, as operation without the xtra data
will take significantly longer.

Adjust default timeout for downloading GPS XTRA data.

30 seconds are perfectly fine, as operation without the xtra data
will take significantly longer.

[Alberto Mardegan (mardy)]

LGTM!

review: Approve

=== 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	2015-10-19 13:04:06 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2015-11-13 10:22:34 +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;
 }
 

=== 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	2015-11-13 10:22:34 +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. */