Merge lp://staging/~mterry/unity8/no-shutdown-dialog-while-suspended into lp://staging/unity8
Status: | Merged |
---|---|
Approved by: | Gerry Boland |
Approved revision: | 1547 |
Merged at revision: | 1562 |
Proposed branch: | lp://staging/~mterry/unity8/no-shutdown-dialog-while-suspended |
Merge into: | lp://staging/unity8 |
Diff against target: |
21 lines (+10/-1) 1 file modified
qml/Shell.qml (+10/-1) |
To merge this branch: | bzr merge lp://staging/~mterry/unity8/no-shutdown-dialog-while-suspended |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gerry Boland (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+246445@code.staging.launchpad.net |
Commit message
Don't show any power dialogs while the screen is off. This is a band-aid to avoid the symptom, while we still investigate the source of why the screen doesn't turn on (and why we seem to not handle the power-button-
Description of the change
Don't show any power dialogs while the screen is off.
From the code:
// FIXME: We only consider power key presses if the screen is
// on because of bug 1410830. The theory is that when that bug
// is encountered, there is a >2s delay between the power press
// event and the power release event, which causes the shutdown
// dialog to appear on resume. So to avoid that symptom while
// we investigate the root cause, we simply won't initiate any
// dialogs when the screen is off.
So to be clear, this is a band-aid to avoid the symptom, while we still investigate the source of why the screen doesn't turn on (and why we seem to not handle the power-button-
To make it worse, this bug is hard to reproduce. I'm not even really sure this band-aid fixes the symptom. But it seems like it would. So that's basically the same, right!?
FAILED: Continuous integration, rev:1546 jenkins. qa.ubuntu. com/job/ unity8- ci/5147/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 804 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- vivid/311 jenkins. qa.ubuntu. com/job/ unity8- vivid-amd64- ci/312 jenkins. qa.ubuntu. com/job/ unity8- vivid-i386- ci/312 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 700 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 802 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 802/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 17078
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/5147/ rebuild
http://