Merge lp:~ricmm/powerd/use-hal-power-hint into lp:powerd

[Ricardo Mendoza]

Use power HAL to signal power subsystems to resume quickly as user interaction is expected

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/powerd-ci/127/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/81/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/powerd-ci/127/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ricmm/powerd/use-hal-power-hint]

101. By Ricardo Mendoza on 2013-10-09

Match dep versionto next release hardware lib

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/powerd-ci/128/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/82/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/powerd-ci/128/rebuild

review: Needs Fixing (continuous-integration)

[Loïc Minier (lool)]

Waiting on libhybris to be in release pocket.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/powerd-ci/130/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Looks good, thanks.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-01 14:16:41 +0000
+++ CMakeLists.txt	2013-10-09 14:55:25 +0000
@@ -112,6 +112,7 @@
   ${PHABLET_LIBRARIES}
   "-lubuntu_application_api"
   "-landroid-properties"
+  "-lhardware"
   ${LIBUDEV_LIBRARIES}
   ${UPOWER_GLIB_LIBRARIES}
   ${UUID_LIBRARIES}

=== modified file 'debian/control'
--- debian/control	2013-09-25 21:29:09 +0000
+++ debian/control	2013-10-09 14:55:25 +0000
@@ -12,6 +12,7 @@
                libplatform-api1-dev,
                libupower-glib-dev,
                uuid-dev,
+               libhardware-dev (>= 0.1.0+git20130606+c5d897a-0ubuntu33),
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/powerd
 # If you aren't a member of ~phablet-team but need to upload packaging changes,

=== modified file 'src/display.c'
--- src/display.c	2013-09-25 21:29:09 +0000
+++ src/display.c	2013-10-09 14:55:25 +0000
@@ -120,6 +120,9 @@
         else
             sf_unblank(display);
     } else {
+        if (strcmp(power_mode, "on") == 0)
+            powerd_hal_signal_activity();
+
         unity_proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
                     G_DBUS_PROXY_FLAGS_NONE,
                     NULL,

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2013-09-24 13:15:40 +0000
+++ src/powerd-internal.h	2013-10-09 14:55:25 +0000
@@ -53,6 +53,7 @@
 
 void powerd_shutdown(void);
 void powerd_exit(int exit_code);
+void powerd_hal_signal_activity(void);
 void powerd_reset_activity_timer(int add);
 void powerd_dbus_init_complete(void);
 int powerd_is_mainloop(void);

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-10-07 11:52:19 +0000
+++ src/powerd.cpp	2013-10-09 14:55:25 +0000
@@ -50,6 +50,8 @@
 
 #include "libsuspend.h"
 
+#include <android/hardware/power.h>
+
 static GThread *powerd_mainloop_thread;
 
 namespace
@@ -153,6 +155,8 @@
     return FALSE;
 }
 
+static struct power_module* _power_module;
+
 void on_new_event(Event* event, void* context)
 {
     switch(event->type)
@@ -241,6 +245,13 @@
 
 }   //namespace
 
+void powerd_hal_signal_activity(void)
+{
+    powerd_warn("signalling activity via HAL");
+    if (_power_module)
+        _power_module->powerHint(_power_module, POWER_HINT_INTERACTION, NULL);
+}
+
 void powerd_reset_activity_timer(int add)
 {
     int timeout;
@@ -466,6 +477,12 @@
     input_area_height : 2048
     };
 
+    int err = hw_get_module(POWER_HARDWARE_MODULE_ID,
+        (hw_module_t const**)&_power_module);
+
+    if (!err)
+        _power_module->init(_power_module);
+
     android_input_stack_initialize(&listener, &config);
     android_input_stack_start();