Mir

Merge lp:~thomas-voss/mir/reenable-wakelock-acquisition-in-input-stack into lp:~mir-team/mir/trunk

Proposed by Thomas Voß
Status: Work in progress
Proposed branch: lp:~thomas-voss/mir/reenable-wakelock-acquisition-in-input-stack
Merge into: lp:~mir-team/mir/trunk
Diff against target: 15 lines (+4/-0)
1 file modified
3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp (+4/-0)
To merge this branch: bzr merge lp:~thomas-voss/mir/reenable-wakelock-acquisition-in-input-stack
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Needs Information
Daniel van Vugt Needs Resubmitting
Alan Griffiths Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+190195@code.launchpad.net

Commit message

eenable wake-lock acquisition in the EventHub if the android power HAL is available.

Description of the change

eenable wake-lock acquisition in the EventHub if the android power HAL is available.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Can you explain what it does? Is there a related bug?

review: Needs Information
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

FTBFS for android-armhf

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Linking CXX shared library ../../lib/libmirserver.so
../../lib/libandroid-input.a(EventHub.cpp.o): In function `android::EventHub::EventHub(std::shared_ptr<mir::input::InputReport> const&)':
/home/dan/bzr/mir/tmp.wake/3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp:224: undefined reference to `acquire_wake_lock'
....

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Also targeting the wrong branch.

review: Needs Resubmitting
Revision history for this message
Kevin DuBois (kdub) wrote :

also why use the legacy power hal? (there's a non-legacy one) any more details on this (and mir/unity/ubuntu touch power architecture) would be appreciated too :)

review: Needs Information
Revision history for this message
Thomas Voß (thomas-voss) wrote :

On hold for now. It turns out that relying on the Power HAL to transition the system to interactive state ensures the desired performance boost.

Unmerged revisions

1092. By Thomas Voß

Reenable wake-lock acquisition in the EventHub if the android power HAL is available.

1091. By Alan Griffiths

* Bump project version to 0.0.14.
* Bump libmirserver version to 6.
* Change default filesystem endpoint to $XDG_RUNTIME_DIR/mir_socket.
  (LP: #1236912)
* Provide a lifecycle callback in libmirclient when server connection is
  lost.
* Allow the default thread pool size to be overridden. (LP: #1233001)
* Ensure nonrectangular surfaces are never bypassed, even if they are
  fullscreen and on top (e.g. Unity8 shell at present). (LP: #1236264)
* Fix uninitialized variable. (LP: #1236697)
* Fix subtle memory problem in android native buffer deletion.
* Merge the two existing FakeEventHub implementations in android-input.
* Use ioctl from included headers instead of redefining it in Mir.
* Document EventFilter::handle().

Approved by PS Jenkins bot, Daniel van Vugt.

1090. By PS Jenkins bot

Releasing 0.0.13+13.10.20131003-0ubuntu1 (revision 1089 from lp:mir).

Approved by PS Jenkins bot.

1089. By Daniel d'Andrada

Fix for LP#1233944

Fixes the Mir-side of bug https://bugs.launchpad.net/mir/+bug/1233944

Event files are first created with root:root permissions and only later
udev rules are applied to it, changing its permissions to root:android-input
and therefore making it readable by unity8-mir

in short: Retry opening a file when its permissions change as it might be
readable now. Fixes: https://bugs.launchpad.net/bugs/1233944.

Approved by PS Jenkins bot, Robert Ancell.

1088. By Alan Griffiths

* bump deb changelog to 0.0.13 and libmirserver5.
lp:~kgunn72/mir/bump-libmirserver5-take2

* graphics: android: disable vsync notifications when screen is off as per hwc specs. rename unblank_or_blank_display to apply_display_state() to remove ambiguity about what is being done.
fixes: lp1233870. Fixes: https://bugs.launchpad.net/bugs/1233870.
branch lp:~kdub/mir/deactive-notifications-when-display-off

* Simplify {Default,Basic}DisplayBufferCompositor classes into one.
branch lp:~vanvugt/mir/simplify-DisplayBufferCompositors

* Make cross-compile-chroot.sh build in parallel when suitable
branch lp:~dandrader/mir/cross-compile-parallel

* Fix race in connection failures. Fixes: https://bugs.launchpad.net/bugs/1201436.
branch lp:~alan-griffiths/mir/fix-1201436
Bug #1201436: Intermittent hang in ClientPidTestFixture.authorizer_may_prevent_connection_of_clients test

* Privatize surface_data.h; not required in any public APIs.
Fixes: https://bugs.launchpad.net/bugs/1223393.
branch lp:~vanvugt/mir/privatize-SurfaceData

* client: Clean up client side error handling and suicide if connection fails
branch lp:~alan-griffiths/mir/client-dies-without-server

* frontend, logging: Provide reporting from frontend::Connector.
branch lp:~alan-griffiths/mir/frontend-ConnectorReport-enablement

* Properly track buffers per-surface (not per session). Failure to do so was
causing premature buffer release and re-use in cases with multiple surfaces
per client/session. In XMir this was seen as out of order, glitchy and slow
frames when using multiple monitors (LP: #1216472). Fixes: https://bugs.launchpad.net/bugs/1216472.
branch lp:~afrantzis/mir/fix-out-of-order-buffers-1216472.

Approved by PS Jenkins bot, Robert Ancell.

1087. By PS Jenkins bot

Releasing 0.0.12+13.10.20131001.1-0ubuntu1 (revision 1086 from lp:mir).

Approved by PS Jenkins bot.

1086. By Kevin DuBois

merge latest dev branch.

Approved by PS Jenkins bot, Alan Griffiths, Kevin DuBois.

1085. By PS Jenkins bot

Releasing 0.0.12+13.10.20130926.1-0ubuntu1 (revision 1084 from lp:mir).

Approved by PS Jenkins bot.

1084. By Alexandros Frantzis

tests: Fix compiler warning about maybe-uninitialized struct member

1083. By Kevin DuBois

frontend, config: Mechanism for connecting via a socket pair.
graphics: android: stop nex4 from tearing
gbm: Blank unused connected outputs.
compositor: tidy up configuration logic for initializing bypass flag.
tests: Add tests for Android's InputReader & friends
Bump libmirserver soname and Mir project version.

Approved by kevin gunn, PS Jenkins bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp'
2--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp 2013-10-03 05:12:59 +0000
3+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp 2013-10-09 17:23:26 +0000
4@@ -20,8 +20,12 @@
5
6 #include "EventHub.h"
7
8+#ifdef ANDROID
9+#include <hardware_legacy/power.h>
10+#else
11 #define acquire_wake_lock(lock, id) {}
12 #define release_wake_lock(id) {}
13+#endif // ANDROID
14
15 #include "mir/input/input_report.h"
16

Subscribers

People subscribed via source and target branches