Merge lp:~afrantzis/mir/android-fix-memory-error into lp:~mir-team/mir/trunk
Status: | Rejected |
---|---|
Rejected by: | Alexandros Frantzis |
Proposed branch: | lp:~afrantzis/mir/android-fix-memory-error |
Merge into: | lp:~mir-team/mir/trunk |
Diff against target: |
68 lines (+7/-19) 2 files modified
src/server/graphics/android/android_platform.cpp (+2/-2) tests/integration-tests/graphics/android/test_buffer_integration.cpp (+5/-17) |
To merge this branch: | bzr merge lp:~afrantzis/mir/android-fix-memory-error |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kevin DuBois (community) | Disapprove | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Mir development team | Pending | ||
Review via email: mp+153331@code.launchpad.net |
Commit message
android: Fix memory error
Description of the change
android: Fix memory error
Note: The conclusions below are based solely on experimentation on the Nexus 4.
Kevin could you please validate that this works properly on the Galaxy Nexus, too?
The native window associated with an EGLSurface is deallocated automatically
by the system when the EGLSurface is destroyed. Deallocating it manually
leads to memory errors and causes all kinds of interesting side effects.
One of these side effects seems to be that we can't create and destroy an
AndroidDisplay multiple times in a process, which forced us to create the display
statically in some integration tests. Since the error is now fixed, we can
remove the workaround and create the AndroidDisplay normally.
PASSED: Continuous integration, rev:502 jenkins. qa.ubuntu. com/job/ mir-ci/ 81/ jenkins. qa.ubuntu. com/job/ mir-quantal- amd64-ci/ 82/console jenkins. qa.ubuntu. com/job/ mir-quantal- amd64-ci/ 82/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ mir-ci/ 81/rebuild
http://