Merge lp:~mterry/unity8/briefly-inactive into lp:unity8

[Michael Terry]

Stop the emergency dialer from accidentally exposing the mtp service.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 No

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

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

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 NA

 * If you changed the UI, has there been a design review?
 NA

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2100
http://jenkins.qa.ubuntu.com/job/unity8-ci/6941/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5759
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/356/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1652
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/353
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5772
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5772/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26040
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/131/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/355
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/355/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26042

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6941/rebuild

review: Needs Fixing (continuous-integration)

[Josh Arenson (josharenson)]

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

 * Did CI run pass?
No, SDK issues that I believe are fixed in another branch

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

Looks good to me, resolves the issue. Would be nice if the dialer started faster (or at least provided feedback sooner). Unrelated to this branch/bug though.

review: Approve

[Daniel d'Andrada (dandrader)]

Could you please format that commit message so that it starts with "A single-line summary or short description of the change (something no longer than 80 or 90 chars)", as explained here:

https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

review: Needs Fixing

[Michael Terry (mterry)]

Done.

[Daniel d'Andrada (dandrader)]

Thanks

review: Abstain

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-11-04 14:57:33 +0000
+++ qml/Greeter/Greeter.qml	2015-12-14 18:09:22 +0000
@@ -33,7 +33,7 @@
     // How far to offset the top greeter layer during a launcher left-drag
     property real launcherOffset
 
-    readonly property bool active: shown || hasLockedApp
+    readonly property bool active: required || hasLockedApp
     readonly property bool fullyShown: loader.item ? loader.item.fullyShown : false
 
     // True when the greeter is waiting for PAM or other setup process

=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2015-09-14 07:47:24 +0000
+++ tests/qmltests/Greeter/tst_Greeter.qml	2015-12-14 18:09:22 +0000
@@ -71,9 +71,9 @@
     }
 
     SignalSpy {
-        id: emergencyCallSpy
+        id: activeChangedSpy
         target: loader.item
-        signalName: "emergencyCall"
+        signalName: "activeChanged"
     }
 
     GSettings {
@@ -142,7 +142,7 @@
             resetLoader();
             teaseSpy.clear();
             sessionStartedSpy.clear();
-            emergencyCallSpy.clear();
+            activeChangedSpy.clear();
             viewShowMessageSpy.clear();
             viewShowPromptSpy.clear();
             viewShowLastChanceSpy.clear();
@@ -471,6 +471,28 @@
             tryCompare(view, "delayMinutes", 0);
         }
 
+        function test_activeIsConstantDuringLockedApp() {
+            // Regression test for bug 1525981: if we flicker active state even
+            // briefly, the mpt-server will allow access to the device's drive.
+
+            selectUser("has-password");
+            verify(greeter.active);
+
+            // Test opening a locked app
+            greeter.lockedApp = "test-app";
+            greeter.notifyAppFocused("test-app");
+            verify(greeter.hasLockedApp);
+            verify(!greeter.shown);
+
+            // Test going back to greeter from that locked app
+            LightDM.Greeter.showGreeter();
+            verify(!greeter.hasLockedApp);
+            verify(greeter.shown);
+
+            // Active state should never have changed
+            compare(activeChangedSpy.count, 0);
+        }
+
         function test_dbusRequestAuthenticationUser() {
             selectUser("no-password");
             LightDM.Greeter.requestAuthenticationUser("has-password");