Merge lp:~mterry/telephony-service/no-screen-on into lp:telephony-service

[Michael Terry]

Drop code that turns on screen upon receiving an MMS, because unity8 does that for us now when a notification appears.

Since unity8 8.11+15.04.20150831.2-0ubuntu1, the screen is automatically turned on when a notification is presented.

Drop code that turns on screen upon receiving an MMS, because unity8 does that for us now when a notification appears.

Since unity8 8.11+15.04.20150831.2-0ubuntu1, the screen is automatically turned on when a notification is presented.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1121
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/551/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/219
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/219

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

review: Approve (continuous-integration)

Unmerged revisions

1121. By Michael Terry on 2015-09-18

Drop code that turns on screen, because unity8 does that for us now

=== modified file 'indicator/textchannelobserver.cpp'
--- indicator/textchannelobserver.cpp	2015-07-23 01:25:44 +0000
+++ indicator/textchannelobserver.cpp	2015-09-18 18:13:02 +0000
@@ -395,21 +395,6 @@
         }
     }
 
-    // WORKAROUND: powerd can't decide when to wake up the screen on incoming mms's
-    // (or other telepathy accounts) as the download of the attachments is made by 
-    // another daemon, so we wake up the screen here.
-    if (!CallManager::instance()->hasCalls() &&
-           (mms || account->type() != AccountEntry::PhoneAccount)) {
-        QDBusInterface unityIface("com.canonical.Unity.Screen",
-                                  "/com/canonical/Unity/Screen",
-                                  "com.canonical.Unity.Screen",
-                                  QDBusConnection::systemBus());
-        QList<QVariant> args;
-        args.append("on");
-        args.append(0);
-        unityIface.callWithArgumentList(QDBus::NoBlock, "setScreenPowerMode", args);
-    }
-
     // add the message to the messaging menu (use hex format to avoid invalid characters)
     QByteArray token(message.messageToken().toUtf8());