Merge lp:~afrantzis/mir/android-gralloc-can-be-safely-closed-quirk into lp:mir
Status: | Merged |
---|---|
Approved by: | Alexandros Frantzis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3124 |
Proposed branch: | lp:~afrantzis/mir/android-gralloc-can-be-safely-closed-quirk |
Merge into: | lp:mir |
Diff against target: |
208 lines (+35/-30) 4 files modified
src/platforms/android/server/android_buffer_allocator.cpp (+15/-10) src/platforms/android/server/device_quirks.cpp (+9/-9) src/platforms/android/server/device_quirks.h (+2/-2) tests/unit-tests/graphics/android/test_device_detection.cpp (+9/-9) |
To merge this branch: | bzr merge lp:~afrantzis/mir/android-gralloc-can-be-safely-closed-quirk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andreas Pokorny (community) | Approve | ||
Kevin DuBois (community) | Approve | ||
Alan Griffiths | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+278563@code.launchpad.net |
Commit message
android: Don't close gralloc if it's not safe to do so on particular devices
Description of the change
android: Don't close gralloc if it's not safe to do so on particular devices
Based on the success of the experimental branch [1], this branch applies the same workaround (don't close gralloc) as a quirk for krillin.
[1] See https:/
and also additional manually triggered runs of the test runner which were all successful: https:/
https:/
https:/
FAILED: Continuous integration, rev:3123 jenkins. qa.ubuntu. com/job/ mir-ci/ 5660/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/5020/ console jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/3926/ console jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/4967/ console jenkins. qa.ubuntu. com/job/ mir-mediumtests -wily-touch/ 923/console jenkins. qa.ubuntu. com/job/ mir-wily- amd64-ci/ 1812/console jenkins. qa.ubuntu. com/job/ mir-wily- i386-ci/ 920/console jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 4967/console jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- wily-armhf/ 924/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/5660/ rebuild
http://