Merge lp:~andreas-pokorny/powerd/blank-on-proximity-powerstate into lp:powerd

[Andreas Pokorny]

Adds two dbus messages to control proximity sensor based blanking from other processes

Those messages are used by telepathy-ofono during a call to blank on proximity depending on the used audio outputs. Since now proximity handling is requested externally the builtin handling ofono voice calls is removed.
powerd-cli now supports a proximity command:
powerd-cli proximity on|off

This change deactivates the builtin proximity handling during calls, and lets an external requester deactivate and activate proximity using a new dbus methods.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/powerd-ci/163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/15/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

The change looks fine, still need to test it though (together with https://code.launchpad.net/~andreas-pokorny/telepathy-ofono/control-proximity-handling-in-powerd/+merge/235358).

Created silo 10 so we can have the packages available in the same PPA.

We just need to make sure telepathy-ofono is handling the same use cases as previously done by powerd.

[Ricardo Salveti (rsalveti)]

Works fine as well.

review: Approve

[lp:~andreas-pokorny/powerd/blank-on-proximity-powerstate]

144. By Andreas Pokorny on 2014-09-30

Trigger suspend on proximity events.

+ moved proximity handling to power-request.c

145. By Andreas Pokorny on 2014-09-30

Adds two new requets to enable and disable proximity based display blanking

instead of combining that behavior with a power state it is now a separate status. That way suspend logic remains unaffected by this.

[Ricardo Salveti (rsalveti)]

As you added a new API, would it be possible to also change powerd-cli to support that?

[lp:~andreas-pokorny/powerd/blank-on-proximity-powerstate]

146. By Andreas Pokorny on 2014-10-01

Adds an option to powerd-cli enable and disable proximty handling

this also fixes the missing dbus reponse.

[Ricardo Salveti (rsalveti)]

Great, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-18 21:33:32 +0000
+++ CMakeLists.txt	2014-10-01 07:49:36 +0000
@@ -53,6 +53,7 @@
   src/powerd-client.c
   src/powerd-object.c
   src/powerd-sensors.cpp
+  src/powerd-proximity.cpp
   src/spline.c
   src/stats.c
   src/util.c
 
=== modified file 'cli/powerd-cli.c'
--- cli/powerd-cli.c	2014-08-19 00:39:27 +0000
+++ cli/powerd-cli.c	2014-10-01 07:49:36 +0000
@@ -101,6 +101,32 @@
 }
 
 gboolean
+requestProximityBlanking(gboolean enable)
+{
+    GVariant *ret = NULL;
+    GError *error = NULL;
+    const char *method = enable ?
+        "enableProximityHandling":
+        "disableProximityHandling";
+
+    ret = g_dbus_proxy_call_sync(powerd_proxy,
+            method,
+            g_variant_new("(s)", "powerd-cli"),
+            G_DBUS_CALL_FLAGS_NONE,
+            -1,
+            NULL,
+            &error);
+    if (ret == NULL) {
+        cli_warn("%s failed: %s", method, error->message);
+        g_error_free(error);
+        return FALSE;
+    }
+
+    g_variant_unref(ret);
+    return TRUE;
+}
+
+gboolean
 requestSysState(const char *name, int state,
         powerd_cookie_t *cookie)
 {
@@ -691,6 +717,8 @@
     printf("client-test - test powerd registration / ack API.\n");
     printf("display <on>\n"\
            "\tMake the display stay on\n");
+    printf("proximity on|off\n"\
+           "\tEnable disable proximity based screen blanking\n");
     printf("help\t- display this usage information.\n");
     printf("list\t- list outstanding requests.\n");
     printf("listen\t- listen for signals from powerd. This runs a\n"\
@@ -732,6 +760,7 @@
        (strcmp(argv[1],"dbusnametest")) &&
        (strcmp(argv[1],"listen")) &&
        (strcmp(argv[1],"display")) &&
+       (strcmp(argv[1],"proximity")) &&
        (strcmp(argv[1],"help")) &&
        (strcmp(argv[1],"clear-sys")) &&
        (strcmp(argv[1],"client-test")) &&
@@ -821,6 +850,27 @@
         clearDisplayState(disp_cookie);
         return 0;
     }
+    else if (!strcmp(argv[1],"proximity")) {
+        gboolean enable = TRUE;
+        if (argc != 3) {
+            fprintf(stderr,"proximity requires a parameter: 'on'|'off'\n");
+            return -1;
+        }
+        if (!strcmp(argv[2],"on"))
+            enable = TRUE;
+        else if (!strcmp(argv[2],"off"))
+            enable = FALSE;
+        else {
+            fprintf(stderr,"proximity requires a parameter: 'on'|'off'\n");
+            return -1;
+        }
+
+        if (requestProximityBlanking(enable) == FALSE) {
+            fprintf(stderr,"failed powerd proximity request\n");
+            return -1;
+        }
+        return 0;
+    }
     else if (!strncmp(argv[1],"clear",strlen("clear"))) {
         if (argc != 3) {
             fprintf(stderr,"clear requires a cookie\n");
 
=== modified file 'data/com.canonical.powerd.xml'
--- data/com.canonical.powerd.xml	2014-08-18 21:33:32 +0000
+++ data/com.canonical.powerd.xml	2014-10-01 07:49:36 +0000
@@ -20,6 +20,14 @@
       <arg type="s" name="cookie" direction="out" />
     </method>
 
+    <method name="enableProximityHandling">
+      <arg type="s" name="name" direction="in" />
+    </method>
+
+    <method name="disableProximityHandling">
+      <arg type="s" name="name" direction="in" />
+    </method>
+
     <method name="clearWakeup">
       <arg type="s" name="cookie" direction="in" />
     </method>
 
=== modified file 'src/power-request.c'
--- src/power-request.c	2014-08-12 07:23:07 +0000
+++ src/power-request.c	2014-10-01 07:49:36 +0000
@@ -43,6 +43,7 @@
     const char *owner;
     uuid_t cookie;
     enum SysPowerStates state;
+    int power_state_flags;
 };
 
 /*
@@ -438,6 +439,7 @@
         if (ret)
             powerd_warn("Failed to prepare for suspend: %d", ret);
     }
+
     ack_pending = powerd_client_transition_start(pending_system_state);
     powerd_sys_state_signal_emit(pending_system_state);
 
@@ -523,7 +525,6 @@
                                                 delayed_state_transition_process,
                                                 NULL);
     }
-
 }
 
 /* Must be called from main loop */
 
=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2014-08-18 21:33:32 +0000
+++ src/powerd-internal.h	2014-10-01 07:49:36 +0000
@@ -97,6 +97,12 @@
 gboolean handle_clear_sys_state(PowerdSource *obj,
                                 GDBusMethodInvocation *invocation,
                                 gchar *cookie);
+gboolean handle_enable_proximity_handling(PowerdSource *obj,
+                                          GDBusMethodInvocation *invocation,
+                                          const char *name);
+gboolean handle_disable_proximity_handling(PowerdSource *obj,
+                                           GDBusMethodInvocation *invocation,
+                                           const char *name);
 gboolean request_sys_state_internal(const char *name, int state,
                                     uuid_t *cookie, const char *owner);
 gboolean clear_sys_state_internal(uuid_t cookie);
 
=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2014-08-18 21:33:32 +0000
+++ src/powerd-object.c	2014-10-01 07:49:36 +0000
@@ -223,6 +223,10 @@
         G_CALLBACK(handle_clear_sys_state), powerd_source);
     g_signal_connect(oskel, "handle-list-sys-requests",
         G_CALLBACK(handle_list_sys_requests), powerd_source);
+    g_signal_connect(oskel, "handle-enable-proximity-handling",
+        G_CALLBACK(handle_enable_proximity_handling), powerd_source);
+    g_signal_connect(oskel, "handle-disable-proximity-handling",
+        G_CALLBACK(handle_disable_proximity_handling), powerd_source);
 
     g_signal_connect(oskel, "handle-register-client",
         G_CALLBACK(handle_register_client), powerd_source);
@@ -343,35 +347,6 @@
 }
 
 void
-ofono_voicecall_proxy_connect_cb(GObject *source_object,
-               GAsyncResult *res,
-               gpointer user_data)
-{
-    GError *error = NULL;
-    GDBusProxy *ofono_proxy;
-    struct call_data *call;
-
-    ofono_proxy = g_dbus_proxy_new_finish(res, &error);
-    if (error) {
-        powerd_warn("%s failed: %s", __func__, error->message);
-        g_error_free(error);
-        return;
-    }
-
-    call = user_data;
-    call->ofono_proxy = ofono_proxy;
-
-    /* Register for voicecall signals */
-    g_signal_connect(ofono_proxy, "g-signal",
-                        G_CALLBACK(on_ofono_voicecall_signal), NULL);
-
-    /* Get current voice call state */
-    g_dbus_proxy_call(ofono_proxy, "GetProperties", NULL,
-                        G_DBUS_CALL_FLAGS_NONE, -1, NULL,
-                        ofono_voicecall_get_props_cb, NULL);
-}
-
-void
 ofono_proxy_connect_cb(GObject *source_object,
                GAsyncResult *res,
                gpointer user_data)
 
=== added file 'src/powerd-proximity.cpp'
--- src/powerd-proximity.cpp	1970-01-01 00:00:00 +0000
+++ src/powerd-proximity.cpp	2014-10-01 07:49:36 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of powerd.
+ *
+ * powerd is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * powerd is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "powerd-internal.h"
+
+#include "libsuspend.h"
+#include "powerd-dbus.h"
+
+#include <unordered_set>
+
+static std::unordered_set<std::string> active_proximity_users;
+gboolean handle_enable_proximity_handling(PowerdSource *obj,
+                                          GDBusMethodInvocation *invocation,
+                                          const char *name)
+{
+    if (active_proximity_users.empty())
+        powerd_sensors_proximity_enable();
+    active_proximity_users.insert(name);
+
+    g_dbus_method_invocation_return_value(invocation, NULL);
+
+    return TRUE;
+}
+
+
+gboolean handle_disable_proximity_handling(PowerdSource *obj,
+                                           GDBusMethodInvocation *invocation,
+                                           const char *name)
+{
+    bool was_empty = active_proximity_users.empty();
+    active_proximity_users.erase(name);
+    if (!was_empty && active_proximity_users.empty())
+        powerd_sensors_proximity_disable();
+
+    g_dbus_method_invocation_return_value(invocation, NULL);
+
+    return TRUE;
+}
+
+void powerd_proximity_event(gboolean near)
+{
+    if (near)
+        turn_display_on(FALSE, UNITY_SCREEN_REASON_PROXIMITY);
+    else
+        turn_display_on(TRUE, UNITY_SCREEN_REASON_PROXIMITY);
+}
+
 
=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2014-08-19 20:22:10 +0000
+++ src/powerd.cpp	2014-10-01 07:49:36 +0000
@@ -92,31 +92,9 @@
 /* List with detected modems */
 static GSList *g_modems = NULL;
 
-static void free_call_data(void *data)
-{
-    struct call_data *call = (struct call_data *) data;
-    g_free(call->obj_name);
-    if (call->ofono_proxy)
-        g_object_unref(call->ofono_proxy);
-}
-
-static gint call_data_cmp(gconstpointer a, gconstpointer b)
-{
-    const struct call_data *call = (const struct call_data *) a;
-    const char *call_name = (const char *) b;
-
-    return strcmp(call->obj_name, call_name);
-}
-
 static GDBusProxy *g_ofono_proxy;
 static GDBusProxy *g_unity_proxy;
 
-/* List with existing calls */
-static GSList *g_calls = NULL;
-
-/* Flag set when proximity sensor is on */
-static gboolean g_proximity_on = FALSE;
-
 static struct power_module* _power_module;
 
 static void
@@ -231,87 +209,6 @@
     g_variant_unref(result);
 }
 
-static void notify_proximity_sensor(const char *call_state)
-{
-    /*
-     * This function enables the proximity sensor in case the new state of the
-     * call is:
-     *
-     * Active - meaning, the call is in progress --> Proximity On
-     * Dialing - a signal made on outbound calls only which means that
-     *           we have started to talk to the network, but the call has not
-     *           been picked up. --> Proximity On (this signal is not
-     *           sent on inbound calls)
-     * Note that the proximity sensor is not activated for "incoming" state
-     * For more details on states see voicecall-api.txt in the ofono source
-     */
-
-    if (g_proximity_on)
-        return;
-
-    if (strcmp("active", call_state) == 0
-            || strcmp("dialing", call_state) == 0) {
-        powerd_sensors_proximity_enable();
-        g_proximity_on = TRUE;
-    }
-}
-
-static void deactivate_proximity_sensor(void)
-{
-    if (!g_proximity_on)
-        return;
-
-    powerd_sensors_proximity_disable();
-    g_proximity_on = FALSE;
-}
-
-
-void powerd_proximity_event(gboolean near)
-{
-    if (near)
-        turn_display_on(FALSE, UNITY_SCREEN_REASON_PROXIMITY);
-    else
-        turn_display_on(TRUE, UNITY_SCREEN_REASON_PROXIMITY);
-}
-
-void
-ofono_voicecall_get_props_cb(GObject *source_object, GAsyncResult *res,
-                             gpointer user_data)
-{
-    GDBusProxy *client = G_DBUS_PROXY(source_object);
-    GVariant *result;
-    GVariant *item;
-    GError *error = NULL;
-    GVariantIter *iter = NULL;
-
-    result = g_dbus_proxy_call_finish(client, res, &error);
-    if (result == NULL) {
-        powerd_warn("%s: call error", __func__);
-        return;
-    }
-
-    g_variant_get(result, "(a{sv})", &iter);
-
-    while ((item = g_variant_iter_next_value(iter))) {
-        GVariant *value = NULL;
-        const char *prop_name = NULL;
-        const char *call_state = NULL;
-
-        g_variant_get(item, "{&sv}", &prop_name, &value);
-
-        if (strcmp("State", prop_name) == 0) {
-            g_variant_get(value, "&s", &call_state);
-            notify_proximity_sensor(call_state);
-            powerd_info("GetProperties. Call State = %s", call_state);
-        }
-
-        g_variant_unref(value);
-        g_variant_unref(item);
-    }
-
-    g_variant_unref(result);
-}
-
 void on_ofono_manager_signal(GDBusProxy *proxy, gchar *sender_name,
     gchar *signal_name, GVariant *parameters, gpointer user_data)
 {
@@ -354,75 +251,13 @@
            GVariant   *parameters,
            gpointer    user_data)
 {
-    GVariant *tmp;
-
     if (!strcmp(signal_name, "CallAdded")) {
-        struct call_data *call;
-
         turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
 
-        call = (struct call_data *) calloc(1, sizeof(*call));
-        tmp = g_variant_get_child_value(parameters, 0);
-        call->obj_name = g_variant_dup_string(tmp, NULL);
-        g_calls = g_slist_prepend(g_calls, call);
-
-        powerd_info("%s incoming call", call->obj_name);
-
-        /* Connect to voicecall interface */
-        g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
-            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-            NULL,
-            "org.ofono",
-            call->obj_name,
-            "org.ofono.VoiceCall",
-            NULL,
-            (GAsyncReadyCallback) ofono_voicecall_proxy_connect_cb,
-            call);
-
-        g_variant_unref(tmp);
+        powerd_info("incoming call");
 
     } else if (!strcmp(signal_name, "CallRemoved")) {
-        const gchar *object_path;
-        GSList *node;
-
-        tmp = g_variant_get_child_value(parameters, 0);
-        object_path = g_variant_get_string(tmp, NULL);
-        node = g_slist_find_custom(g_calls, object_path, call_data_cmp);
-        if (node != NULL) {
-            free_call_data(node->data);
-            g_calls = g_slist_delete_link(g_calls, node);
-            powerd_info("%s call removed", object_path);
-        }
-
-        if (g_calls == NULL)
-            deactivate_proximity_sensor();
-
-        g_variant_unref(tmp);
-    }
-}
-
-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 = NULL;
-    const char *call_state = NULL;
-
-    if (!strcmp(signal_name, "PropertyChanged")) {
-        g_variant_get(parameters, "(&sv)", &prop_name, &value);
-
-        if (!strcmp(prop_name, "State")) {
-            g_variant_get(value, "&s", &call_state);
-
-            powerd_info("Call State = %s", call_state);
-            notify_proximity_sensor(call_state);
-        }
-
-        g_variant_unref(value);
+        powerd_info("call removed");
     }
 }
 
@@ -608,7 +443,6 @@
     powerd_client_deinit();
     powerd_stats_deinit();
     g_slist_free_full(g_modems, free_modem_data);
-    g_slist_free_full(g_calls, free_call_data);
     if (g_ofono_proxy)
         g_object_unref(g_ofono_proxy);
     if (g_unity_proxy)
 
=== modified file 'src/powerd.h'
--- src/powerd.h	2014-05-21 03:17:03 +0000
+++ src/powerd.h	2014-10-01 07:49:36 +0000
@@ -30,11 +30,23 @@
 
     //The Active state will prevent system suspend
     POWERD_SYS_STATE_ACTIVE,
+    //Substate of Active with disabled proximity based blanking
+    POWERD_SYS_STATE_ACTIVE_BLANK_ON_PROXIMITY,
 
     POWERD_NUM_POWER_STATES
 };
 
 /*
+ * Flags that can be applied to power states
+ * TODO Create dedicated power states instead?
+ */
+enum SysPowerStateFlags {
+    POWERD_POWER_STATE_FLAG_MASK = 0xFFFF0000,
+    // disables display blanking on proximity events
+    POWERD_DISABLE_PROXIMITY_SENSOR_BLANKING = 0x10000,
+};
+
+/*
  * Clients should treat this as an opaque type. Though this isn't really
  * possible until the client library is written.
  */