Merge lp://qastaging/~afrantzis/unity-system-compositor/repowerd-wip into lp://qastaging/unity-system-compositor

Proposed by Alexandros Frantzis
Status: Superseded
Proposed branch: lp://qastaging/~afrantzis/unity-system-compositor/repowerd-wip
Merge into: lp://qastaging/unity-system-compositor
Diff against target: 6894 lines (+1000/-4833)
54 files modified
CMakeLists.txt (+0/-5)
debian/control (+3/-5)
debian/unity-system-compositor.install (+3/-1)
src/CMakeLists.txt (+11/-20)
src/clock.h (+0/-41)
src/com.canonical.Unity.Display.xml (+10/-0)
src/com.canonical.Unity.PowerButton.xml (+11/-0)
src/com.canonical.Unity.Screen.xml (+0/-29)
src/com.canonical.Unity.UserActivity.xml (+8/-0)
src/com.canonical.Unity.conf (+18/-5)
src/hw_performance_booster.cpp (+0/-48)
src/hw_performance_booster.h (+0/-44)
src/mir_screen.cpp (+15/-383)
src/mir_screen.h (+6/-77)
src/null_performance_booster.cpp (+0/-28)
src/null_performance_booster.h (+0/-34)
src/performance_booster.cpp (+0/-52)
src/performance_booster.h (+0/-41)
src/power_button_event_sink.h (+39/-0)
src/power_state_change_reason.h (+0/-31)
src/powerd_mediator.cpp (+0/-493)
src/powerd_mediator.h (+0/-114)
src/screen.h (+2/-17)
src/screen_event_handler.cpp (+37/-100)
src/screen_event_handler.h (+20/-38)
src/screen_hardware.h (+0/-51)
src/server.cpp (+31/-52)
src/server.h (+9/-67)
src/steady_clock.cpp (+0/-22)
src/steady_clock.h (+0/-36)
src/system_compositor.cpp (+9/-13)
src/system_compositor.h (+2/-2)
src/unity_display_service.cpp (+46/-285)
src/unity_display_service.h (+6/-29)
src/unity_power_button_event_sink.cpp (+56/-0)
src/unity_power_button_event_sink.h (+40/-0)
src/unity_user_activity_event_sink.cpp (+67/-0)
src/unity_user_activity_event_sink.h (+40/-0)
src/unity_user_activity_type.h (+25/-0)
src/user_activity_event_sink.h (+40/-0)
tests/include/usc/test/mock_screen.h (+3/-19)
tests/integration-tests/CMakeLists.txt (+4/-4)
tests/integration-tests/test_deadlock_lp1491566.cpp (+0/-228)
tests/integration-tests/test_powerd_mediator.cpp (+0/-737)
tests/integration-tests/test_unity_display_service.cpp (+27/-244)
tests/integration-tests/test_unity_power_button_event_sink.cpp (+83/-0)
tests/integration-tests/test_unity_services.cpp (+7/-7)
tests/integration-tests/test_unity_user_activity_event_sink.cpp (+99/-0)
tests/integration-tests/unity_display_dbus_client.cpp (+56/-0)
tests/integration-tests/unity_display_dbus_client.h (+45/-0)
tests/integration-tests/unity_screen_dbus_client.cpp (+0/-112)
tests/integration-tests/unity_screen_dbus_client.h (+0/-54)
tests/unit-tests/test_mir_screen.cpp (+25/-1080)
tests/unit-tests/test_screen_event_handler.cpp (+97/-185)
To merge this branch: bzr merge lp://qastaging/~afrantzis/unity-system-compositor/repowerd-wip
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing
Unity System Compositor Development Team Pending
Review via email: mp+296174@code.qastaging.launchpad.net

Commit message

Grand update for repowerd compatibility

Description of the change

Grand update for repowerd compatibility

This MP updates unity-system-compositor so that it works with repowerd. Notable changes:

* Removed handling of com.canonical.Unity.Screen interface (now handled by repowerd).
* Removed all power management related logic.
* Introduced handling of new interface com.canonical.Unity.Display interface, which just handles turning the screen on/off in terms of rendering.
* Introduced emission of com.canonical.Unity.UserActivity signals
* Introduced emission of com.canonical.Unity.PowerButton signals

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches