Merge lp:~mterry/unity8/fix-wakelocks into lp:unity8

[Michael Terry]

Let qtmir know which apps are exempt from the lifecycle management.
This way, it can manage its own wakelocks better and stop preventing the system from deep sleeping.

Let qtmir know which apps are exempt from the lifecycle management, so it can manage its own wakelocks better (and stop preventing the system from deep sleeping).

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 https://code.launchpad.net/~mterry/unity-api/fix-wakelocks/+merge/279476
 https://code.launchpad.net/~mterry/qtmir/fix-wakelocks/+merge/279481

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

 * 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?
 I'm on that team

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

[lp:~mterry/unity8/fix-wakelocks]

2079. By Michael Terry on 2015-12-03

Merge from surfaceItemFillMode

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2078
http://jenkins.qa.ubuntu.com/job/unity8-ci/6880/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5590/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1486/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1486/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/293/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/292/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5604/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/294/console

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/fix-wakelocks]

2080. By Michael Terry on 2015-12-03

Add more comments and sanity checking to the exempt tests

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-26 13:51:24 +0000
+++ CMakeLists.txt	2015-12-03 18:14:47 +0000
@@ -57,7 +57,7 @@
 find_package(Qt5Concurrent 5.4 REQUIRED)
 find_package(Qt5Sql 5.4 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=11)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=12)
 
 # Standard install paths
 include(GNUInstallDirs)

=== modified file 'debian/control'
--- debian/control	2015-11-26 13:51:24 +0000
+++ debian/control	2015-12-03 18:14:47 +0000
@@ -29,7 +29,7 @@
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
                libudev-dev,
-               libunity-api-dev (>= 7.103),
+               libunity-api-dev (>= 7.104),
                libusermetricsoutput1-dev,
                libxcb1-dev,
                pkg-config,
@@ -128,7 +128,7 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
-         unity-application-impl-11,
+         unity-application-impl-12,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-7,
@@ -174,7 +174,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-11,
+          unity-application-impl-12,
 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-11-04 14:58:05 +0000
+++ qml/Stages/PhoneStage.qml	2015-12-03 18:14:47 +0000
@@ -426,14 +426,16 @@
 
                     readonly property bool isDash: model.appId == "unity8-dash"
 
-                    readonly property bool canSuspend: model.isTouchApp
-                            && !isExemptFromLifecycle(model.appId)
+                    Binding {
+                        target: appDelegate.application
+                        property: "exemptFromLifecycle"
+                        value: !model.isTouchApp || isExemptFromLifecycle(model.appId)
+                    }
 
                     Binding {
                         target: appDelegate.application
                         property: "requestedState"
-                        value: !canSuspend
-                                   || (isDash && root.keepDashRunning)
+                        value: (isDash && root.keepDashRunning)
                                    || (!root.suspended && appDelegate.focus)
                                ? ApplicationInfoInterface.RequestedRunning
                                : ApplicationInfoInterface.RequestedSuspended

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2015-11-04 14:58:05 +0000
+++ qml/Stages/TabletStage.qml	2015-12-03 18:14:47 +0000
@@ -612,14 +612,16 @@
 
                     readonly property bool isDash: model.appId == "unity8-dash"
 
-                    readonly property bool canSuspend: model.isTouchApp
-                            && !isExemptFromLifecycle(model.appId)
+                    Binding {
+                        target: spreadTile.application
+                        property: "exemptFromLifecycle"
+                        value: !model.isTouchApp || isExemptFromLifecycle(model.appId)
+                    }
 
                     Binding {
                         target: spreadTile.application
                         property: "requestedState"
-                        value: !canSuspend
-                                   || (isDash && root.keepDashRunning)
+                        value: (isDash && root.keepDashRunning)
                                    || (!root.suspended && (model.appId == priv.mainStageAppId
                                                            || model.appId == priv.sideStageAppId))
                                ? ApplicationInfoInterface.RequestedRunning

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-11-06 09:11:53 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-12-03 18:14:47 +0000
@@ -42,6 +42,7 @@
     , m_rotatesWindowContents(false)
     , m_requestedState(RequestedRunning)
     , m_isTouchApp(true)
+    , m_exemptFromLifecycle(false)
     , m_manualSurfaceCreation(false)
 {
 }
@@ -60,6 +61,7 @@
     , m_rotatesWindowContents(false)
     , m_requestedState(RequestedRunning)
     , m_isTouchApp(true)
+    , m_exemptFromLifecycle(false)
     , m_manualSurfaceCreation(false)
 {
 }
@@ -253,6 +255,20 @@
     m_isTouchApp = isTouchApp;
 }
 
+bool ApplicationInfo::exemptFromLifecycle() const
+{
+    return m_exemptFromLifecycle;
+}
+
+void ApplicationInfo::setExemptFromLifecycle(bool exemptFromLifecycle)
+{
+    if (m_exemptFromLifecycle != exemptFromLifecycle)
+    {
+        m_exemptFromLifecycle = exemptFromLifecycle;
+        Q_EMIT exemptFromLifecycleChanged(m_exemptFromLifecycle);
+    }
+}
+
 void ApplicationInfo::onSessionSurfaceChanged(MirSurface* surface)
 {
     if (surface != nullptr && m_state == Starting) {

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2015-10-01 17:43:10 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2015-12-03 18:14:47 +0000
@@ -92,6 +92,9 @@
     bool isTouchApp() const override;
     void setIsTouchApp(bool isTouchApp); // only in mock
 
+    bool exemptFromLifecycle() const override;
+    void setExemptFromLifecycle(bool) override;
+
 public:
     void setSession(Session* session);
     Session* session() const { return m_session; }
@@ -125,6 +128,7 @@
     bool m_rotatesWindowContents;
     RequestedState m_requestedState;
     bool m_isTouchApp;
+    bool m_exemptFromLifecycle;
 
     bool m_manualSurfaceCreation;
 };

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2015-11-05 14:04:32 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2015-12-03 18:14:47 +0000
@@ -107,6 +107,8 @@
         return app->focused();
     case RoleIsTouchApp:
         return app->isTouchApp();
+    case RoleExemptFromLifecycle:
+        return app->exemptFromLifecycle();
     case RoleSession:
         return QVariant::fromValue(app->session());
     case RoleFullscreen:

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2015-10-01 17:43:10 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2015-12-03 18:14:47 +0000
@@ -43,7 +43,7 @@
     static ApplicationManager *singleton();
 
     enum MoreRoles {
-        RoleSession = RoleIsTouchApp+1,
+        RoleSession = RoleExemptFromLifecycle+1,
         RoleFullscreen,
     };
     enum Flag {

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-11-06 13:27:15 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-12-03 18:14:47 +0000
@@ -59,6 +59,8 @@
     Qt::ScreenOrientations supportedOrientations() const override { return Qt::PortraitOrientation; }
     bool rotatesWindowContents() const override { return false; }
     bool isTouchApp() const override { return true; }
+    bool exemptFromLifecycle() const override { return false; }
+    void setExemptFromLifecycle(bool) override {}
 
     // Methods used for mocking (not in the interface)
     void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-11-24 17:44:18 +0000
+++ tests/qmltests/tst_Shell.qml	2015-12-03 18:14:47 +0000
@@ -1859,19 +1859,20 @@
 
             var app1 = ApplicationManager.startApplication("libreoffice");
             waitUntilAppWindowIsFullyLoaded(app1);
-            var app2 = ApplicationManager.startApplication("dialer-app");
+            var app2 = ApplicationManager.startApplication("gallery-app");
             waitUntilAppWindowIsFullyLoaded(app2);
 
-            // Make sure app1 is unfocused but still running
-            compare(app1.session.surface.activeFocus, false);
-            compare(app1.isTouchApp, false); // sanity check our mock, which sets this for us
-            compare(app1.requestedState, ApplicationInfoInterface.RequestedRunning);
+            // Make sure app1 is exempt with a requested suspend
+            verify(app1.exemptFromLifecycle);
+            verify(!app1.isTouchApp); // sanity check our mock, which sets this for us
+            verify(!app1.session.surface.activeFocus);
+            compare(app1.requestedState, ApplicationInfoInterface.RequestedSuspended);
         }
 
         function test_lifecyclePolicyExemption_data() {
             return [
-                {tag: "phone", formFactor: "phone", usageScenario: "phone", suspendsApps: true},
-                {tag: "tablet", formFactor: "tablet", usageScenario: "tablet", suspendsApps: true}
+                {tag: "phone", formFactor: "phone", usageScenario: "phone"},
+                {tag: "tablet", formFactor: "tablet", usageScenario: "tablet"}
             ]
         }
 
@@ -1883,12 +1884,13 @@
 
             var app1 = ApplicationManager.startApplication("webbrowser-app");
             waitUntilAppWindowIsFullyLoaded(app1);
-            var app2 = ApplicationManager.startApplication("dialer-app");
+            var app2 = ApplicationManager.startApplication("gallery-app");
             waitUntilAppWindowIsFullyLoaded(app2);
 
-            // Make sure app1 is unfocused but still running
-            compare(app1.session.surface.activeFocus, false);
-            compare(app1.requestedState, ApplicationInfoInterface.RequestedRunning);
+            // Make sure app1 is exempt with a requested suspend
+            verify(app1.exemptFromLifecycle);
+            verify(!app1.session.surface.activeFocus);
+            compare(app1.requestedState, ApplicationInfoInterface.RequestedSuspended);
         }
 
         function test_switchToStagedForcesLegacyAppClosing_data() {