telephony-service

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

Proposed by Michael Terry on 2015-09-18

Status:

Needs review

Proposed branch:

Merge into:

Diff against target:

1 file modified

indicator/textchannelobserver.cpp (+0/-15)

To merge this branch:

bzr merge lp:~mterry/telephony-service/no-screen-on

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-09-18
Ubuntu Phablet Team		2015-09-18	Pending
Review via email: mp+271699@code.launchpad.net

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.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-18:

review: Approve (continuous-integration)

1121. By Michael Terry on 2015-09-18: Drop code that turns on screen, because unity8 does that for us now

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 === 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());