Mir

Merge lp://qastaging/~mir-team/mir/catch-exceptions-at-android-driver-boundary into lp://qastaging/mir

  1. catch-exceptions-at-android-driver-boundary
  2. Merge into development-branch
Proposed by Robert Carr
Status: Merged
Approved by: Robert Carr
Approved revision: no longer in the source branch.
Merged at revision: 2307
Proposed branch: lp://qastaging/~mir-team/mir/catch-exceptions-at-android-driver-boundary
Merge into: lp://qastaging/mir
Diff against target: 260 lines (+34/-32)
9 files modified
src/client/mir_buffer_stream_api.cpp (+1/-1)
src/client/mir_connection_api.cpp (+1/-1)
src/client/mir_cursor_api.cpp (+1/-1)
src/client/mir_prompt_session_api.cpp (+1/-1)
src/client/mir_screencast_api.cpp (+1/-1)
src/client/mir_surface_api.cpp (+1/-1)
src/common/graphics/android/mir_native_window.cpp (+13/-14)
src/include/common/mir/uncaught.h (+7/-1)
src/platforms/mesa/client/native_surface.cpp (+8/-11)
To merge this branch: bzr merge lp://qastaging/~mir-team/mir/catch-exceptions-at-android-driver-boundary
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Review via email: mp+249124@code.qastaging.launchpad.net

Commit message

Catch exceptions at android driver boundary

Description of the change

See the requirement described at:
https://code.launchpad.net/~mir-team/mir/squash-overzealous-exception-to-accomodate-underzealous-drivers/+merge/249112

It turns out this will only be called on startup so taking the more correct path of throwing and catching the exception is ok.

To post a comment you must log in.
Revision history for this message
Kevin DuBois (kdub) wrote :

Lets fix it here instead:
http://bazaar.launchpad.net/~mir-team/mir/development-branch/view/head:/src/common/graphics/android/mir_native_window.cpp#L156

so that all the Interpreters benefit

review: Needs Fixing
Revision history for this message
Kevin DuBois (kdub) wrote :

Although, if this is holding up a release, consider the above an 'abstain'

Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2310
http://jenkins.qa.ubuntu.com/job/mir-ci/2939/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/936
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/936/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1206
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4247
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17900

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2939/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches