Merge lp:~andreas-pokorny/powerd/blank-on-proximity-powerstate into lp:powerd
Proposed by
Andreas Pokorny
Status: | Merged |
---|---|
Approved by: | Ricardo Salveti |
Approved revision: | 143 |
Merged at revision: | 143 |
Proposed branch: | lp:~andreas-pokorny/powerd/blank-on-proximity-powerstate |
Merge into: | lp:powerd |
Diff against target: |
514 lines (+148/-198) 9 files modified
CMakeLists.txt (+1/-0) cli/powerd-cli.c (+50/-0) data/com.canonical.powerd.xml (+8/-0) src/power-request.c (+2/-1) src/powerd-internal.h (+6/-0) src/powerd-object.c (+4/-29) src/powerd-proximity.cpp (+63/-0) src/powerd.cpp (+2/-168) src/powerd.h (+12/-0) |
To merge this branch: | bzr merge lp:~andreas-pokorny/powerd/blank-on-proximity-powerstate |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ricardo Salveti (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+235356@code.launchpad.net |
Commit message
Adds two dbus messages to control proximity sensor based blanking from other processes
Those messages are used by telepathy-ofono during a call to blank on proximity depending on the used audio outputs. Since now proximity handling is requested externally the builtin handling ofono voice calls is removed.
powerd-cli now supports a proximity command:
powerd-cli proximity on|off
Description of the change
This change deactivates the builtin proximity handling during calls, and lets an external requester deactivate and activate proximity using a new dbus methods.
To post a comment you must log in.
PASSED: Continuous integration, rev:143 jenkins. qa.ubuntu. com/job/ powerd- ci/163/ jenkins. qa.ubuntu. com/job/ powerd- utopic- armhf-ci/ 15 jenkins. qa.ubuntu. com/job/ powerd- utopic- armhf-ci/ 15/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/powerd- ci/163/ rebuild
http://