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

[Thomas Voß]

Add a vanilla gps.conf file and install it to /etc/gps.conf.
Make sure that expections thrown while trying to download GPS Xtra data do not abort the service.

Add a vanilla gps.conf file and install it to /etc/gps.conf.
Make sure that expections thrown while trying to download GPS Xtra data do not abort the service.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/location-service-ci/228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/135
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/135

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Looks good.

review: Approve

[lp:~thomas-voss/location-service/fix-1347887]

75. By Thomas Voß on 2014-07-30

Make sure that /etc/gps.conf is only opened for reading when the HAL is actually instantiated.

76. By Thomas Voß on 2014-07-30

Only install /etc/gps.conf on architectures that support it.

77. By Thomas Voß on 2014-07-30

Switch to dpkg-source 3.0.

=== added symlink 'debian/libubuntu-location-service2.install.amd64'
=== target is u'libubuntu-location-service2.install.with-gps'
=== added symlink 'debian/libubuntu-location-service2.install.armhf'
=== target is u'libubuntu-location-service2.install.with-gps'
=== added symlink 'debian/libubuntu-location-service2.install.i386'
=== target is u'libubuntu-location-service2.install.with-gps'
=== added file 'debian/libubuntu-location-service2.install.with-gps'
--- debian/libubuntu-location-service2.install.with-gps	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-location-service2.install.with-gps	2014-07-30 14:15:59 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/libubuntu-location-service.so.*
+usr/lib/*/libubuntu-location-service-connectivity.so.*
+/etc/gps.conf

=== modified file 'debian/source/format'
--- debian/source/format	2013-05-28 14:20:45 +0000
+++ debian/source/format	2014-07-30 14:15:59 +0000
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/providers/gps/CMakeLists.txt	2014-06-12 11:10:17 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/CMakeLists.txt	2014-07-30 14:15:59 +0000
@@ -16,6 +16,8 @@
     add_library(
         gps
 
+        gps.conf
+
         android_hardware_abstraction_layer.h
         android_hardware_abstraction_layer.cpp
 
@@ -37,5 +39,7 @@
       -DCOM_UBUNTU_LOCATION_SERVICE_PROVIDERS_GPS ${ENABLED_PROVIDER_TARGETS_DEFINITIONS}
       PARENT_SCOPE
     )
+
+    install(FILES gps.conf DESTINATION /etc/)
   endif (UBUNTU_HARDWARE_GPS_H)
 endif (LOCATION_SERVICE_ENABLE_GPS_PROVIDER)

=== 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-07-11 12:56:40 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2014-07-30 14:15:59 +0000
@@ -147,9 +147,19 @@
 
     auto thiz = static_cast<android::HardwareAbstractionLayer*>(context);
 
-    auto xtra_gps_data = thiz->impl.gps_xtra_downloader->download_xtra_data(thiz->impl.gps_xtra_configuration);
-    if (not xtra_gps_data.empty())
-        u_hardware_gps_inject_xtra_data(thiz->impl.gps_handle, &xtra_gps_data.front(), xtra_gps_data.size());
+    try
+    {
+        auto xtra_gps_data = thiz->impl.gps_xtra_downloader->download_xtra_data(thiz->impl.gps_xtra_configuration);
+        if (not xtra_gps_data.empty())
+            u_hardware_gps_inject_xtra_data(thiz->impl.gps_handle, &xtra_gps_data.front(), xtra_gps_data.size());
+    } catch(const std::exception& e)
+    {
+        LOG(ERROR) << "Error downloading GPS Xtra data: " << e.what();
+    } catch(...)
+    {
+        LOG(ERROR) << "Error downloading GPS Xtra data.";
+    }
+
 }
 
 void android::HardwareAbstractionLayer::on_gps_ni_notify(UHardwareGpsNiNotification* notification, void* context)
@@ -607,16 +617,43 @@
 
 namespace
 {
-std::ifstream etc_gps_conf{"/etc/gps.conf"};
+android::GpsXtraDownloader::Configuration gps_xtra_downloader_configuration(std::istream& in)
+{
+    android::GpsXtraDownloader::Configuration config;
+
+    try
+    {
+        config = android::GpsXtraDownloader::Configuration::from_gps_conf_ini_file(in);
+        return config;
+    } catch(const std::exception& e)
+    {
+        // TODO(tvoss): We should log the error here
+        // For now, we silently fallback to a set of default options.
+    } catch(...)
+    {
+        // For now, we silently fallback to a set of default options.
+    }
+
+    config.xtra_hosts =
+    {
+        "http://xtra1.gpsonextra.net/xtra2.bin",
+        "http://xtra2.gpsonextra.net/xtra2.bin",
+        "http://xtra3.gpsonextra.net/xtra2.bin"
+    };
+
+    return config;
+}
 }
 
 std::shared_ptr<gps::HardwareAbstractionLayer> gps::HardwareAbstractionLayer::create_default_instance()
 {
+    static std::ifstream in{"/etc/gps.conf"};
+
     static android::HardwareAbstractionLayer::Configuration config
     {
         {
             create_xtra_downloader(),
-            android::GpsXtraDownloader::Configuration::from_gps_conf_ini_file(etc_gps_conf)
+            gps_xtra_downloader_configuration(in)
         }
     };
 

=== added file 'src/location_service/com/ubuntu/location/providers/gps/gps.conf'
--- src/location_service/com/ubuntu/location/providers/gps/gps.conf	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/gps.conf	2014-07-30 14:15:59 +0000
@@ -0,0 +1,10 @@
+# XTRA_SERVER_QUERY (1=on, 0=off)
+# If XTRA_SERVER_QUERY is on, the XTRA_SERVERs listed
+# below will be ignored, and instead the servers will
+# be queried from the modem.
+XTRA_SERVER_QUERY=0
+# XTRA_SERVERs below are used only if XTRA_SERVER_QUERY
+# is off.
+XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra2.bin
+XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra2.bin
+XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra2.bin