Merge lp:~tiagosh/telephony-service/request-wake-lock into lp:telephony-service

[Tiago Salem Herrmann]

Request a wake lock so the device doesn't go to deep sleep when receiving an sms.

Request a wake lock so the device doesn't go to deep sleep when receiving an sms.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1209
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/62/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1621
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/383
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1621
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1468
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1468
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1468
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1468
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1468
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1468
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1468
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1468
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1468
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1468/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/62/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

com.canonical.powerd.requestWakeup doesn't acquire a wake lock, it asks for a wakeup signal to be emitted after a timeout. This wakeup signal is special in that it can wake up the phone from suspend, but it doesn't act as a wakelock, i.e. it doesn't inhibit future suspends.

To acquire a wakelock from (re)powerd use instead:

cookie = com.canonical.powerd.requestSysState("telephony-service-indicator", 1)

(where '1' means 'active state')

and to release the wakelock:

com.canonical.powerd.clearSysState(cookie)

review: Needs Fixing

[lp:~tiagosh/telephony-service/request-wake-lock]

1210. By Tiago Salem Herrmann on 2016-09-27

change requestWakeup to requestSysState

[Tiago Salem Herrmann (tiagosh)]

Thanks for the review.
Just fixed as you suggested and it works fine.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1210
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/65/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1640/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1640
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1486/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1486/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1486
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1486/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1486
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1486/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1486
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1486/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1486
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1486/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1486
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1486/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1486/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1486/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/65/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'indicator/textchannelobserver.cpp'
--- indicator/textchannelobserver.cpp	2016-03-30 13:34:38 +0000
+++ indicator/textchannelobserver.cpp	2016-09-27 13:39:41 +0000
@@ -42,6 +42,7 @@
 #include <QContactFetchRequest>
 #include <QContactFilter>
 #include <QContactPhoneNumber>
+#include <QDBusInterface>
 #include <QImage>
 #include <History/TextEvent>
 #include <History/Manager>
@@ -158,6 +159,7 @@
 }
 
 TextChannelObserver::TextChannelObserver(QObject *parent) :
+    mPowerdIface("com.canonical.powerd", "/com/canonical/powerd", "com.canonical.powerd", QDBusConnection::systemBus()),
     QObject(parent)
 {
     connect(MessagingMenu::instance(),
@@ -644,12 +646,20 @@
         QTimer *timer = new QTimer(this);
         timer->setInterval(1500);
         timer->setSingleShot(true);
+        QString wakeToken;
+        QDBusReply<QString> reply = mPowerdIface.call("requestSysState", "telephony-service-indicator", 1);
+        if (reply.isValid()) {
+            wakeToken = reply.value();
+        }
         QByteArray token(message.messageToken().toUtf8());
         mUnreadMessages.append(token);
         QObject::connect(timer, &QTimer::timeout, [=]() {
             triggerNotificationForMessage(message, account->accountId(), participantIds);
             Metrics::instance()->increment(Metrics::ReceivedMessages);
             timer->deleteLater();
+            if (!wakeToken.isEmpty()) {
+                mPowerdIface.call("clearSysState", wakeToken);
+            }
         });
         timer->start();
     }

=== modified file 'indicator/textchannelobserver.h'
--- indicator/textchannelobserver.h	2015-04-30 15:49:52 +0000
+++ indicator/textchannelobserver.h	2016-09-27 13:39:41 +0000
@@ -64,6 +64,7 @@
     QList<Tp::TextChannelPtr> mFlashChannels;
     QMap<NotifyNotification*, NotificationData*> mNotifications;
     QList<QByteArray> mUnreadMessages;
+    QDBusInterface mPowerdIface;
 };
 
 #endif // TEXTCHANNELOBSERVER_H