Merge lp:~unity-api-team/indicator-network/lp1352744 into lp:indicator-network/14.10

[Antti Kaijanmäki]

Add missing break to switch-case.

When ofono tells modem supports RadioSettings interface
there is an unintentional falltrough which causes
ofono code to try to create an SimManager instead.

Testers:
Ensure indicator-network is running properly with and without a SIM card inserted to the SIM slot.

To verify the indicator is running properly:
1) pull down the indicator and verify that the indicator contains wifi items and does not flicker
2) open system-settings -> wi-fi and verify that system-settings shows a list of available access points.

silo:
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-006

To get wifi working using phablet-shell do:
$ nmcli d wifi connect <access point name> password <password> iface wlan0

[Pete Woods (pete-woods)]

LGTM.

review: Approve

[Selene ToyKeeper (toykeeper)]

Looks good to me too. This seems to fix the wifi indicator issues I had on the past few images. I tested on a mako and barajas, and tried the dual sim option too. The only issues I saw were unrelated to the changes made in this silo.

I didn't do full dogfooding or reverse dep tests, since we're not in traincon 0, but regardless this seems like an obvious improvement since it fixes a core device function.

[Tony Espy (awe)]

LGTM2

review: Approve

=== modified file 'network/dbus-cpp/services/ofono.h'
--- network/dbus-cpp/services/ofono.h	2014-04-30 21:31:38 +0000
+++ network/dbus-cpp/services/ofono.h	2014-08-05 17:04:02 +0000
@@ -1083,6 +1083,7 @@
                     case Property::Interfaces::Type::Phonebook:
                     case Property::Interfaces::Type::PushNotification:
                     case Property::Interfaces::Type::RadioSettings:
+                        break;
                     case Property::Interfaces::Type::SimManager:
                     {
                         if (!simManager->get()) {