Merge lp:~rsalveti/powerd/abort_cant_find_android_compat into lp:powerd

[Ricardo Salveti]

Aborting in case it can't find the android input compat stack

Aborting in case it can't find the android input compat stack

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/powerd-ci/141/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/11/console

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

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

https://wiki.ubuntu.com/Process/Merges/TestPlans/Powerd

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?

Yes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?

Yes

 * Has your component "TestPlan” been executed successfully on emulator, N4?

Only with N4

 * Has a 5 minute exploratory testing run been executed on N4?

Yes

 * What components might get impacted by your changes?

Auto/manual suspend

[Ricardo Salveti (rsalveti)]

> FAILED: Continuous integration, rev:114

Failed because latest libhybris is not yet promoted to release.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/powerd-ci/142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/12/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Good, thanks

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-01-23 16:41:00 +0000
+++ debian/control	2014-03-20 02:29:53 +0000
@@ -6,13 +6,13 @@
                cmake,
                libglib2.0-dev,
                android-headers (>= 4.2.2),
-               libhybris-dev (>= 0.1.0+git20131206+0cdd7f2-0ubuntu1),
+               libhybris-dev (>= 0.1.0+git20131207+e452e83-0ubuntu12),
                python:any,
                libandroid-properties-dev,
                libplatform-api1-dev,
                libupower-glib-dev,
                uuid-dev,
-               libhardware-dev (>= 0.1.0+git20131206+0cdd7f2-0ubuntu1),
+               libhardware-dev (>= 0.1.0+git20131207+e452e83-0ubuntu12),
 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/powerd.cpp'
--- src/powerd.cpp	2014-01-23 19:19:39 +0000
+++ src/powerd.cpp	2014-03-20 02:29:53 +0000
@@ -483,6 +483,14 @@
     if (!err)
         _power_module->init(_power_module);
 
+    /* Compat input is needed otherwise there's no way to know when
+     * the user is actively using the system */
+    if (!android_input_check_availability()) {
+        powerd_error("Android compat input library not found, aborting");
+        g_exit_code = -1;
+        goto fail_compat_init;
+    }
+
     android_input_stack_initialize(&listener, &config);
     android_input_stack_start();
 
@@ -499,6 +507,7 @@
     android_input_stack_stop();
     android_input_stack_shutdown();
 
+fail_compat_init:
     powerd_ps_deinit();
     dbus_name_watch_deinit();
     powerd_autobrightness_deinit();