Merge lp:~tiagosh/telepathy-ofono/wake-up-screen into lp:telepathy-ofono

[Tiago Salem Herrmann]

Power the screen on before disabling the proximity sensor.

Power the screen on before disabling the proximity sensor.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/146/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/146/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'powerdaudiomodemediator.cpp'
--- powerdaudiomodemediator.cpp	2014-12-04 13:31:28 +0000
+++ powerdaudiomodemediator.cpp	2014-12-15 19:46:38 +0000
@@ -16,6 +16,7 @@
  * Authors: Andreas Pokorny <[e-mail]>
  */
 
+#include <QDBusInterface>
 #include "powerdaudiomodemediator.h"
 
 PowerDAudioModeMediator::PowerDAudioModeMediator(PowerD &powerd)
@@ -36,10 +37,20 @@
 
 void PowerDAudioModeMediator::apply() const
 {
-    if (mProximityEnabled)
+    if (mProximityEnabled) {
         powerd.enableProximityHandling();
-    else
+    } else {
+        // we need to power the screen on before disabling the proximity handling
+        QDBusInterface unityIface("com.canonical.Unity.Screen",
+                                  "/com/canonical/Unity/Screen",
+                                  "com.canonical.Unity.Screen",
+                                  QDBusConnection::systemBus());
+        QList<QVariant> args;
+        args.append("on");
+        args.append(3);
+        unityIface.callWithArgumentList(QDBus::NoBlock, "setScreenPowerMode", args);
         powerd.disableProximityHandling();
+    }
 }
 
 void PowerDAudioModeMediator::audioOutputClosed()