Merge lp:~mfisch/powerd/proximity-sensor-fix into lp:powerd

[Matt Fischer]

  * Only enable proximity sensor when the call is answered (LP: #1189945)
  * Clean up some of the signal handling code by separating the signal
    handlers, which should be slightly more performant

Listen for active/disconnected from VoiceCall and only en/disable proximity sensor on those events. This ensures that the proximity sensor is only enabled when a call is answered, not when it is incoming but not yet picked up.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/powerd-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/14/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/60/rebuild

review: Approve (continuous-integration)

[lp:~mfisch/powerd/proximity-sensor-fix]

47. By Matt Fischer on 2013-06-14

Cleanup and add comments

48. By Matt Fischer on 2013-06-14

Merge from trunk

49. By Matt Fischer on 2013-06-14

removing unused code per code review comment

[Seth Forshee (sforshee)]

173 + if (!strcmp(signal_name, "PropertyChanged")) {
174 + g_variant_get(parameters, "(&sv)", &prop_name, &value);
175 + if (!strcmp(prop_name,"State")) {
176 + g_variant_get(value, "&s", &prop_value);
177 + powerd_debug("Call State = %s", prop_value);
178 + if ((!strcmp(prop_value,"active")) ||
179 + (!strcmp(prop_value,"alerting"))) {
180 + //call is active, enable sensor
181 + if (powerd_add_display_request(&prox_sensor_req))
182 + powerd_warn("Request to use proximity sensor failed");
183 + }

For an outbound call won't we make 2 requests here? If so, the second will overwrite the cookie for the first, and so the first will never be released.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/powerd-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/16/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/62/rebuild

review: Approve (continuous-integration)

[lp:~mfisch/powerd/proximity-sensor-fix]

50. By Matt Fischer on 2013-06-14

Making CR changes, don't make a request for alerting and active

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/powerd-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/17/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/63/rebuild

review: Approve (continuous-integration)

[lp:~mfisch/powerd/proximity-sensor-fix]

51. By Matt Fischer on 2013-06-14

Fixing indentation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/powerd-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/18/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/64/rebuild

review: Approve (continuous-integration)

[Seth Forshee (sforshee)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-12 14:57:44 +0000
+++ debian/changelog	2013-06-14 16:29:27 +0000
@@ -1,12 +1,18 @@
-powerd (0.13daily13.06.12-0ubuntu2) UNRELEASED; urgency=low
+powerd (0.13daily13.06.12-0ubuntu3) UNRELEASED; urgency=low
 
+  [ Seth Forshee ]
   * Change display request support to not update the display state
     when added/removed requests cause no aggregate change
   * Emit a signal when the display state changes
   * Fix errant "Unknown signal from powerd" messages when running
     'powerd-cli listen'
 
- -- Seth Forshee <[e-mail]>  Wed, 12 Jun 2013 09:52:59 -0500
+  [ Matthew Fischer ]
+  * Only enable proximity sensor when the call is answered (LP: #1189945)
+  * Clean up some of the signal handling code by separating the signal
+    handlers, which should be slightly more performant
+
+ -- Matthew Fischer <[e-mail]>  Thu, 13 Jun 2013 14:14:27 -0600
 
 powerd (0.13daily13.06.12-0ubuntu1) saucy; urgency=low
 

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2013-06-13 20:18:18 +0000
+++ src/powerd-internal.h	2013-06-14 16:29:27 +0000
@@ -102,8 +102,12 @@
                          gpointer user_data);
 
 /* dbus signal handlers */
-void on_ofono_signal(GDBusProxy *proxy, gchar *sender_name, gchar *signal_name,
-    GVariant *parameters, gpointer user_data);
+void on_ofono_voicecallmanager_signal(GDBusProxy *proxy, gchar *sender_name,
+    gchar *signal_name, GVariant *parameters, gpointer user_data);
+void on_ofono_messagemanager_signal(GDBusProxy *proxy, gchar *sender_name,
+    gchar *signal_name, GVariant *parameters, gpointer user_data);
+void on_ofono_voicecall_signal(GDBusProxy *proxy, gchar *sender_name,
+    gchar *signal_name, GVariant *parameters, gpointer user_data);
 
 /* dbus proxy async setup */
 void ofono_proxy_connect_cb(GObject *source_object, GAsyncResult *res,

=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2013-06-13 19:23:44 +0000
+++ src/powerd-object.c	2013-06-14 16:29:27 +0000
@@ -195,15 +195,31 @@
 {
     GError *error = NULL;
     GDBusProxy *ofono_proxy = NULL;
-    powerd_debug("ofono_proxy_async called");
+    const char *interface_name = "";
 
     ofono_proxy = g_dbus_proxy_new_finish (res, &error);
     if (error) {
-        powerd_warn("ofono_proxy_finish failed: %s", error->message);
+        powerd_warn("ofono_proxy_connect_cb failed: %s", error->message);
         g_error_free(error);
     }
     else {
-        g_signal_connect(ofono_proxy, "g-signal", G_CALLBACK (on_ofono_signal), NULL);
-        powerd_debug("ofono_proxy_finish succeeded");
+        interface_name = g_dbus_proxy_get_interface_name(ofono_proxy);
+        powerd_debug("ofono_proxy_connect_cb: proxy is %s", interface_name);
+        if (!strcmp(interface_name,"org.ofono.VoiceCall")) {
+            g_signal_connect(ofono_proxy, "g-signal",
+                G_CALLBACK (on_ofono_voicecall_signal), NULL);
+        }
+        else if (!strcmp(interface_name,"org.ofono.VoiceCallManager")) {
+            g_signal_connect(ofono_proxy, "g-signal",
+                G_CALLBACK (on_ofono_voicecallmanager_signal), NULL);
+        }
+        else if (!strcmp(interface_name,"org.ofono.MessageManager")) {
+            g_signal_connect(ofono_proxy, "g-signal",
+                G_CALLBACK (on_ofono_messagemanager_signal), NULL);
+        }
+        else {
+            powerd_warn("unknown interface name for this proxy, ignoring");
+        }
+        powerd_debug("ofono_proxy_connect_cb succeeded");
     }
 }

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-06-13 18:47:27 +0000
+++ src/powerd.cpp	2013-06-14 16:29:27 +0000
@@ -206,27 +206,93 @@
 }
 
 void
-on_ofono_signal (GDBusProxy *proxy,
-           gchar      *sender_name,
-           gchar      *signal_name,
-           GVariant   *parameters,
-           gpointer    user_data)
-{
-    powerd_debug("we get signal from %s: %s", sender_name, signal_name);
+on_ofono_voicecallmanager_signal (GDBusProxy *proxy,
+           gchar      *sender_name,
+           gchar      *signal_name,
+           GVariant   *parameters,
+           gpointer    user_data)
+{
+    powerd_debug("we get signal from %s: %s", sender_name, signal_name);
+    /* from org.ofono.VoiceCallManager - a call was added */
+    if (!strcmp(signal_name, "CallAdded")) {
+        powerd_debug("Waking up the device - Incoming Call");
+        powerd_reset_activity_timer(1);
+    }
+}
+
+void
+on_ofono_messagemanager_signal (GDBusProxy *proxy,
+           gchar      *sender_name,
+           gchar      *signal_name,
+           GVariant   *parameters,
+           gpointer    user_data)
+{
+    powerd_debug("we get signal from %s: %s", sender_name, signal_name);
+    /* from org.ofono.MessageManager */
     if ((!strcmp(signal_name, "IncomingMessage")) ||
         (!strcmp(signal_name, "ImmediateMessage"))) {
         powerd_debug("Waking up the device - Incoming SMS");
         powerd_reset_activity_timer(1);
     }
-    else if (!strcmp(signal_name, "CallAdded")) {
-        powerd_debug("Waking up the device - Incoming Call");
-        if (powerd_add_display_request(&prox_sensor_req))
-            powerd_warn("Request to use proximity sensor failed");
-        powerd_reset_activity_timer(1);
-    }
-    else if (!strcmp(signal_name, "CallRemoved")) {
-        powerd_debug("Call over");
-        powerd_remove_display_request(prox_sensor_req.cookie);
+}
+
+void
+on_ofono_voicecall_signal (GDBusProxy *proxy,
+           gchar      *sender_name,
+           gchar      *signal_name,
+           GVariant   *parameters,
+           gpointer    user_data)
+{
+    GVariant *value = NULL;
+    const char *prop_name;
+    const char *prop_value;
+    static gboolean alerted = FALSE;
+
+    powerd_debug("we get signal from %s: %s", sender_name, signal_name);
+
+    /* This function enables and disables the proximity sensor based
+     * on the state of the call.
+     *
+     * Active - meaning, the call is in progress --> Proximity On
+     * Alerting - a signal made on outbound calls only which means that
+     *            the phone is ringing on the other side, but has not
+     *            been picked up. --> Proximity On (this signal is not
+     *            sent on inbound calls)
+     * Disconnected - the call is over. --> Proximity Off.
+     *
+     * For more details on states see voicecall-api.txt in the ofono source
+     */
+
+    /* Note: As of June 13, 2013, the phone cannot successfully
+     * accept a call while another call is in progress. When this is fixed
+     * the code below will need to be rewritten to handle multiple
+     * active/disconnected signals. LP: #1191033 (mfisch) */
+
+    if (!strcmp(signal_name, "PropertyChanged")) {
+        g_variant_get(parameters, "(&sv)", &prop_name, &value);
+        if (!strcmp(prop_name,"State")) {
+            g_variant_get(value, "&s", &prop_value);
+            powerd_debug("Call State = %s", prop_value);
+            if (!strcmp(prop_value,"active")) {
+                if (!alerted) {
+                    //call is active, enable sensor
+                    if (powerd_add_display_request(&prox_sensor_req))
+                        powerd_warn("Request to use proximity sensor failed");
+                }
+            }
+            if (!strcmp(prop_value,"alerting")) {
+                alerted = TRUE;
+                //call is altering, enable sensor
+                if (powerd_add_display_request(&prox_sensor_req))
+                    powerd_warn("Request to use proximity sensor failed");
+            }
+            else if (!strcmp(prop_value,"disconnected")) {
+                alerted = FALSE;
+                //call is disconnected, disable sensor
+                powerd_remove_display_request(prox_sensor_req.cookie);
+            }
+            g_variant_unref(value);
+        }
     }
 }
 
@@ -269,6 +335,7 @@
         powerd_name_acquired_cb, powerd_name_lost_cb, NULL, NULL);
     powerd_debug("owner id: %u", name_id);
 
+    /* for incoming SMS signals */
     g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
         G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
         NULL,
@@ -279,6 +346,7 @@
         (GAsyncReadyCallback)ofono_proxy_connect_cb,
         NULL);
 
+    /* for incoming calls Added/Removed signals */
     g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
         G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
         NULL,
@@ -289,6 +357,17 @@
         (GAsyncReadyCallback)ofono_proxy_connect_cb,
         NULL);
 
+    /* for answering a call/hanging up signals */
+    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
+        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+        NULL,
+        "org.ofono",
+        "/ril_0/voicecall01",
+        "org.ofono.VoiceCall",
+        NULL,
+        (GAsyncReadyCallback)ofono_proxy_connect_cb,
+        NULL);
+
     activity_timeout = get_activity_timeout_from_gsettings();
     powerd_debug("Activity Timeout is %d seconds\n", activity_timeout);