Merge lp:~tiagosh/telepathy-ofono/rtm-14.09-fix-1398525 into lp:telepathy-ofono/rtm-14.09

[Tiago Salem Herrmann]

Disable proximity sensor also when using a wired headset.

Disable proximity sensor also when using a wired headset.

[Bill Filler (bfiller)]

tested, approved

review: Approve

[lp:~tiagosh/telepathy-ofono/rtm-14.09-fix-1398525]

105. By Tiago Salem Herrmann on 2014-12-15

power the screen on before disabling the proximity handling

[Bill Filler (bfiller)]

re-tested, works with updated fix

review: Approve

=== modified file 'connection.cpp'
--- connection.cpp	2014-10-15 12:32:16 +0000
+++ connection.cpp	2014-12-15 19:42:30 +0000
@@ -1005,9 +1005,10 @@
 {
     qDebug("PulseAudio audio mode changed: 0x%x", mode);
 
-    if ((mode == AudioModeEarpiece && mActiveAudioOutput != "default") ||
-        (mode == AudioModeWiredHeadset && mActiveAudioOutput != "default")) {
-        setActiveAudioOutput("default");
+    if (mode == AudioModeEarpiece && mActiveAudioOutput != "earpiece") {
+        setActiveAudioOutput("earpiece");
+    } else if (mode == AudioModeWiredHeadset && mActiveAudioOutput != "wired_headset") {
+        setActiveAudioOutput("wired_headset");
     } else if (mode == AudioModeSpeaker && mActiveAudioOutput != "speaker") {
         setActiveAudioOutput("speaker");
     } else if (mode == AudioModeBluetooth && mActiveAudioOutput != "bluetooth") {

=== modified file 'powerdaudiomodemediator.cpp'
--- powerdaudiomodemediator.cpp	2014-09-30 17:25:02 +0000
+++ powerdaudiomodemediator.cpp	2014-12-15 19:42:30 +0000
@@ -16,6 +16,7 @@
  * Authors: Andreas Pokorny <[e-mail]>
  */
 
+#include <QDBusInterface>
 #include "powerdaudiomodemediator.h"
 
 PowerDAudioModeMediator::PowerDAudioModeMediator(PowerD &powerd)
@@ -25,7 +26,7 @@
 
 void PowerDAudioModeMediator::audioModeChanged(const QString &mode)
 {
-    bool enableProximity = !(mode == "speaker" || mode == "bluetooth");
+    bool enableProximity = !(mode == "speaker" || mode == "bluetooth" || mode == "wired_headset");
 
     if (mProximityEnabled != enableProximity)
     {
@@ -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()