Merge lp:~afrantzis/powerd/fix-1489326-screen-flash-when-proximity-covered into lp:powerd

[Alexandros Frantzis]

Apply workaround for proximity sensors not sending initial state only for problematic sensors

Apply workaround for proximity sensors not sending initial state only for problematic sensors

Don't send the extra synthetic proximity FAR event (which is what turns on the screen momentarily), unless it is actually needed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:177
http://jenkins.qa.ubuntu.com/job/powerd-ci/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/13/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~afrantzis/powerd/fix-1489326-screen-flash-when-proximity-covered]

178. By Alexandros Frantzis on 2015-08-31

Sync with lp:ubuntu/powerd

179. By Alexandros Frantzis on 2015-08-31

Update debian/changelog

[Kevin DuBois (kdub)]

seems reasonable as a fix... I guess powerd-sensors.cpp and powerd-sensors.h are shaping up to be more of a class than disjoint functions though.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-30 05:15:59 +0000
+++ debian/changelog	2015-08-31 13:54:42 +0000
@@ -1,3 +1,16 @@
+powerd (0.16+15.10.20150831-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Apply workaround for proximity sensors not sending initial
+    state only for problematic sensors (LP: #1489326)
+
+ -- Alexandros Frantzis <[e-mail]>  Mon, 31 Aug 2015 16:41:34 +0300
+
+powerd (0.16+15.10.20150730-0ubuntu2~gcc5.1) wily; urgency=medium
+
+  * No-change test rebuild for g++5 ABI transition
+
+ -- Steve Langasek <[e-mail]>  Thu, 30 Jul 2015 21:36:06 +0000
+
 powerd (0.16+15.10.20150730-0ubuntu1) wily; urgency=medium
 
   [ Alberto Aguirre ]
 
=== modified file 'src/powerd-sensors.cpp'
--- src/powerd-sensors.cpp	2015-07-29 23:48:24 +0000
+++ src/powerd-sensors.cpp	2015-08-31 13:54:42 +0000
@@ -22,15 +22,27 @@
 #include "powerd-internal.h"
 #include "powerd-sensors.h"
 #include "log.h"
+#include <atomic>
 
 #include <ubuntu/application/sensors/light.h>
 #include <ubuntu/application/sensors/proximity.h>
 
 UASensorsProximity* prox_sensor;
 UASensorsLight* light_sensor;
+GMainLoop* main_loop = NULL;
+std::atomic<bool> allow_synthetic{false};
+
+gboolean emit_synthetic_proximity_far(void *context)
+{
+    if (allow_synthetic)
+        powerd_proximity_event(FALSE);
+
+    return FALSE;
+}
 
 void on_new_proximity_event(UASProximityEvent *event, void *context)
 {
+    allow_synthetic = false;
     switch (uas_proximity_event_get_distance(event))
     {
         case U_PROXIMITY_NEAR:
@@ -50,14 +62,18 @@
 {
     //FIXME: Some proximity sensors do not
     //send an initial event when enabled and nothing is close
-    //Perhaps this should be called on a timeout instead
-    powerd_proximity_event(FALSE);
+    //To work around this, we schedule a synthetic proximity
+    //far event in case no event has been emitted 500ms
+    //after enabling the proximity sensor
+    allow_synthetic = true;
+    g_timeout_add(500, emit_synthetic_proximity_far, NULL);
 
     ua_sensors_proximity_enable(prox_sensor);
 }
 
 void powerd_sensors_proximity_disable(void)
 {
+    allow_synthetic = false;
     ua_sensors_proximity_disable(prox_sensor);
 }
 
@@ -80,8 +96,9 @@
         ua_sensors_light_disable(light_sensor);
 }
 
-void powerd_sensors_init(void)
+void powerd_sensors_init(GMainLoop *ml)
 {
+    main_loop = ml;
     prox_sensor = ua_sensors_proximity_new();
     if (prox_sensor != NULL) {
         ua_sensors_proximity_set_reading_cb(prox_sensor,
 
=== modified file 'src/powerd-sensors.h'
--- src/powerd-sensors.h	2013-05-29 21:06:00 +0000
+++ src/powerd-sensors.h	2015-08-31 13:54:42 +0000
@@ -22,7 +22,9 @@
 #ifndef __POWERD_SENSORS_H__
 #define __POWERD_SENSORS_H__
 
-void powerd_sensors_init(void);
+#include <glib.h>
+
+void powerd_sensors_init(GMainLoop* main_loop);
 void powerd_sensors_proximity_enable(void);
 void powerd_sensors_proximity_disable(void);
 
 
=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2015-07-20 14:53:30 +0000
+++ src/powerd.cpp	2015-08-31 13:54:42 +0000
@@ -444,6 +444,9 @@
             (GBusNameVanishedCallback)unity_screen_name_vanished_cb,
             NULL, NULL);
 
+    main_loop = g_main_loop_new (NULL, FALSE);
+    signal(SIGTERM, sigterm_quit);
+
     /* Init this first, data is used by other inits */
     device_config_init();
 
@@ -455,13 +458,10 @@
     dbus_name_watch_init();
     powerd_backlight_init();
     powerd_autobrightness_init();
-    powerd_sensors_init();
+    powerd_sensors_init(main_loop);
     powerd_ps_init();
     wakeup_init();
 
-    main_loop = g_main_loop_new (NULL, FALSE);
-    signal(SIGTERM, sigterm_quit);
-
     int err = hw_get_module(POWER_HARDWARE_MODULE_ID,
         (hw_module_t const**)&_power_module);