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

[Thomas Voß]

Map edge -> gsm.
Map hspa -> umts.

Map edge -> gsm.
Map hspa -> umts.

[Manuel de la Peña (mandel)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:96
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~thomas-voss/location-service/fix-1357042/+merge/230885/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/location-service-ci/262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/169
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/169

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp'
--- src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp	2014-08-14 20:38:48 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp	2014-08-14 20:38:48 +0000
@@ -36,11 +36,11 @@
         },
         {
             org::Ofono::Manager::Modem::NetworkRegistration::Technology::edge(),
-            com::ubuntu::location::connectivity::RadioCell::Type::unknown
+            com::ubuntu::location::connectivity::RadioCell::Type::gsm
         },
         {
             org::Ofono::Manager::Modem::NetworkRegistration::Technology::hspa(),
-            com::ubuntu::location::connectivity::RadioCell::Type::unknown
+            com::ubuntu::location::connectivity::RadioCell::Type::umts
         },
         {std::string(), com::ubuntu::location::connectivity::RadioCell::Type::unknown}
     };