Merge lp:~unity-api-team/unity8/unlock-all-modems-on-boot-rtm into lp:unity8/rtm-14.09

[Antti Kaijanmäki]

Unlock all modems on boot.

[Michael Terry (mterry)]

LGTM, tested in RTM.

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 Yes

 * Did CI run pass? If not, please explain why.
 TBD

 * Did you make sure that the branch does not contain spurious tags?
 Yes

review: Approve

[Michael Terry (mterry)]

As marked in the other MP, this needs a test fix too.

review: Needs Fixing

[lp:~unity-api-team/unity8/unlock-all-modems-on-boot-rtm]

1355. By Antti Kaijanmäki on 2014-10-15

re-enable tst_unlockAllModemsOnBoot

[Michał Sawicz (saviq)]

As per the trunk MP.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-10-06 08:00:45 +0000
+++ debian/control	2014-10-15 09:05:48 +0000
@@ -97,7 +97,7 @@
 Recommends: unity-scope-click,
             unity-scope-mediascanner2,
             unity-scope-scopes,
-Breaks: indicator-network (<< 0.5.1),
+Breaks: indicator-network (<< 0.5.1+14.10.20141014),
         ubuntu-touch-session (<< 0.107),
         unity8-greeter (<< 7.89),
 Replaces: ubuntu-touch-session (<< 0.82~),

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-10-08 20:36:48 +0000
+++ qml/Shell.qml	2014-10-15 09:05:48 +0000
@@ -533,10 +533,9 @@
                 }
             }
 
-            /* TODO re-enable when the corresponding changes in the service land (LP: #1361074)
             Component.onCompleted: {
                 Connectivity.unlockAllModems()
-            } */
+            }
 
             onUnlocked: greeter.hide()
             onSelected: {

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-10-06 16:39:10 +0000
+++ tests/qmltests/tst_Shell.qml	2014-10-15 09:05:48 +0000
@@ -549,8 +549,6 @@
         }
 
         function test_unlockAllModemsOnBoot() {
-            // TODO reenable when service ready (LP: #1361074)
-            expectFail("", "Unlock on boot temporarily disabled");
             tryCompare(unlockAllModemsSpy, "count", 1)
         }