Merge lp://qastaging/~albaguirre/mir/minimize-1498550 into lp://qastaging/mir
| Status: | Merged |
|---|---|
| Approved by: | Alberto Aguirre |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2971 |
| Proposed branch: | lp://qastaging/~albaguirre/mir/minimize-1498550 |
| Merge into: | lp://qastaging/mir |
| Diff against target: |
220 lines (+64/-27) 7 files modified
src/platforms/android/server/display.cpp (+0/-1) src/platforms/android/server/display_disconnected_exception.h (+41/-0) src/platforms/android/server/display_group.cpp (+4/-13) src/platforms/android/server/display_group.h (+0/-2) src/platforms/android/server/real_hwc_wrapper.cpp (+14/-1) src/platforms/android/server/real_hwc_wrapper.h (+2/-0) tests/unit-tests/graphics/android/test_display_group.cpp (+3/-10) |
| To merge this branch: | bzr merge lp://qastaging/~albaguirre/mir/minimize-1498550 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alan Griffiths | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Query HWC for display connection if hwc->set fails.
Avoid using hotplug events to ignore commit errors; instead have the wrapper query the external display connection status and issue a DisplayDisconne
This only minimizes the occurences of lp:1498550, as there are still situations in which hwc->set fails due to unplugging the external display but hwc still reports the display as connected. The only recovery in this situation seems to be to tear down the compositor thread and recreate it as it happens when a display configuration occurs.
Description of the change
This only minimizes the occurences of lp:1498550, as there are still situations in which hwc->set fails due to unplugging the external display but hwc still reports the display as connected. The only recovery in this situation seems to be to tear down the compositor thread and recreate it as it happens when a display configuration occurs.
| PS Jenkins bot (ps-jenkins) wrote | # |
| Alberto Aguirre (albaguirre) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
FAILED: Continuous integration, rev:2962
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://