Mir

Merge lp://qastaging/mir into lp://qastaging/~mir-team/mir/trunk

development-branch
Merge into trunk

Proposed by kevin gunn on 2013-09-27

Status:

Merged

Approved by:

kevin gunn on 2013-09-29

Approved revision:

1094

Merged at revision:

1086

Proposed branch:

lp://qastaging/mir

Merge into:

lp://qastaging/~mir-team/mir/trunk

Diff against target:

1373 lines (+579/-161)

23 files modified

3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp (+157/-5)
include/test/mir_test_framework/display_server_test_fixture.h (+2/-0)
include/test/mir_test_framework/stub_client_connection_configuration.h (+35/-0)
include/test/mir_test_framework/testing_client_configuration.h (+43/-0)
include/test/mir_test_framework/testing_process_manager.h (+7/-8)
src/client/mir_client_library.cpp (+39/-17)
src/server/graphics/android/hwc_common_device.cpp (+15/-13)
src/server/options/program_option.cpp (+2/-1)
tests/acceptance-tests/test_client_authorization.cpp (+7/-0)
tests/acceptance-tests/test_client_focus_notification.cpp (+2/-9)
tests/acceptance-tests/test_client_input.cpp (+8/-15)
tests/acceptance-tests/test_client_library.cpp (+30/-17)
tests/acceptance-tests/test_focus_selection.cpp (+2/-9)
tests/acceptance-tests/test_server_shutdown.cpp (+2/-9)
tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp (+2/-9)
tests/acceptance-tests/test_surfaceloop.cpp (+3/-10)
tests/acceptance-tests/test_surfaces_with_output_id.cpp (+2/-9)
tests/mir_test_framework/CMakeLists.txt (+1/-0)
tests/mir_test_framework/display_server_test_fixture.cpp (+9/-6)
tests/mir_test_framework/testing_client_options.cpp (+126/-0)
tests/mir_test_framework/testing_process_manager.cpp (+41/-1)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+25/-1)
tests/unit-tests/logging/test_legacy_input_report.cpp (+19/-22)

To merge this branch:

bzr merge lp://qastaging/mir

Related bugs:

Bug #1434430: [regression] Mir servers can't run any more on Ubuntu Core (since r2408)	High	Invalid
Bug #1447430: [regression] mir_acceptance_tests: TestClientCursorAPI.cursor_passed_through_nested_server is crashing most of the time	High	Fix Released
Bug #1463873: Android uses mir_display_output_invalid_id (0) as an output id value	High	Fix Released
Bug #1483779: Mir server crashes with - std::exception::what: Attempt to remove an overlay which was never added or which has been previously removed	High	Fix Released
Bug #1483909: [regression] surface remains invisible when changing from state minimized/hidden to any other	Medium	Fix Released
Bug #1489806: On Wily/mesa-kms starting a server with a "test client" crashes the server	Medium	Fix Released
Bug #1511798: display configuration not reset when application exits	Undecided	Fix Released
Bug #1517132: Assert when after log-in inside the session	Undecided	Fix Released
Bug #1517990: Test failure in NestedServer.display_configuration_reset_when_application_exits	Medium	Fix Released
Bug #1518372: Build failure due to missing dependency of client rpc code on mir protobuf	Medium	Fix Released
Bug #1519276: Unit test failures in Display.* on Android	Critical	Fix Released
Bug #1556205: mir_demo_server --test-client [mir_demo_client_scroll\|mir_demo_client_flicker] fails	Low	Fix Released
Bug #1560943: Racy shutdown in mir_demo_client_scroll causes SEGFAULT	Low	Fix Released
Bug #1582066: --display-report=log shows some invalid uninitialized EGL attribute values	Low	Fix Released
Bug #1602646: [testsfail] failure in NestedInput.on_input_device_state_nested_server_emits_input_device_state	High	Fix Released
Bug #1647244: [ FAILED ] ClientLogging.reports_performance (lag == 0)	High	Fix Released
Bug #1649882: mir_surface_spec_add_render_surface does not set logical sizes	Medium	Fix Released
Bug #1661072: [regression] Mir 0.26.0 - spinner loading animation, minimize, maximize too fast	Medium	Fix Released
Bug #1661128: [regression] Unity8 stutters constantly (like half frame rate) using Mir 0.26.0	High	Fix Released
Bug #1674201: cross-compile-chroot.sh (to zesty) fails to build [cannot find -ludev] due to libudev.so being in a different directory to where libudev.pc searches for it	High	Won't Fix
Bug #1716353: Wayland clients do not work on miral-desktop	Critical	Fix Released
Bug #1717061: miral-kiosk crashes on ldiv0 only on raspi3 with webkit	Critical	Fix Released
Bug #1718968: Keyboard modifiers (e.g. <shift> don't work for wayland clients	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-09-28
Alan Griffiths			Approve on 2013-09-27
Kevin DuBois (community)		2013-09-27	Approve on 2013-09-27
Review via email: mp+188086@code.qastaging.launchpad.net

Commit message

merge latest dev branch

Description of the change

graphics: android: change fb blank request to only by made when there's a change of state. Also correct a failing unit test in trunk fix: lp-1231594.

Bring back android-input logging functionality
- prefix log message with the tag name from where the log function was called.
- filter log messages by tag name and priority with the ANDROID_LOG_TAGS
environment var.

Revision history for this message