Merge lp://qastaging/~afrantzis/unity-system-compositor/fix-1461476-display-off-ubuntu into lp://qastaging/unity-system-compositor/ubuntu
| Status: | Merged |
|---|---|
| Merged at revision: | 205 |
| Proposed branch: | lp://qastaging/~afrantzis/unity-system-compositor/fix-1461476-display-off-ubuntu |
| Merge into: | lp://qastaging/unity-system-compositor/ubuntu |
| Diff against target: |
80 lines (+37/-3) 2 files modified
src/unity_screen_service.cpp (+11/-3) tests/integration-tests/test_unity_screen_service.cpp (+26/-0) |
| To merge this branch: | bzr merge lp://qastaging/~afrantzis/unity-system-compositor/fix-1461476-display-off-ubuntu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Unity System Compositor Development Team | Pending | ||
|
Review via email:
|
|||
Commit message
Don't restart the inactivity timers when receiving invalid dbus calls or uninteresting dbus events
Previously, invalid dbus calls (e.g., trying to remove a non-existent keepDisplayOn request), or uninteresting dbus events (e.g., being informed about disconnections of dbus clients that hadn't issued any keepDisplayOn requests), would restart the inactivity timers, effectively increasing the delay until display dimming and poweroff.
Description of the change
Don't restart the inactivity timers when receiving invalid dbus calls or uninteresting dbus events
Previously, invalid dbus calls (e.g., trying to remove a non-existent keepDisplayOn request), or uninteresting dbus events (e.g., being informed about disconnections of dbus clients that hadn't issued any keepDisplayOn requests), would restart the inactivity timers, effectively increasing the delay until display dimming and poweroff.
| PS Jenkins bot (ps-jenkins) wrote | # |
PASSED: Continuous integration, rev:205
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://