Merge lp://qastaging/~mterry/qtmir/warn-on-xapp into lp://qastaging/qtmir
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~mterry/qtmir/warn-on-xapp |
Merge into: | lp://qastaging/qtmir |
Prerequisite: | lp://qastaging/~mterry/qtmir/more-accurate-mocks |
Diff against target: |
837 lines (+256/-146) 13 files modified
CMakeLists.txt (+1/-1) debian/changelog (+6/-0) debian/control (+2/-2) debian/gles-patches/convert-to-gles.patch (+1/-1) src/modules/Unity/Application/application_manager.cpp (+51/-36) src/modules/Unity/Application/application_manager.h (+1/-0) src/modules/Unity/Application/taskcontroller.h (+1/-0) src/modules/Unity/Application/upstart/taskcontroller.cpp (+86/-77) src/modules/Unity/Application/upstart/taskcontroller.h (+1/-0) tests/framework/mock_task_controller.cpp (+13/-0) tests/framework/mock_task_controller.h (+3/-0) tests/framework/qtmir_test.cpp (+1/-0) tests/modules/ApplicationManager/application_manager_test.cpp (+89/-29) |
To merge this branch: | bzr merge lp://qastaging/~mterry/qtmir/warn-on-xapp |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot (community) | continuous-integration | Needs Fixing | |
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Mir development team | Pending | ||
Review via email: mp+279172@code.qastaging.launchpad.net |
Commit message
Support new ubuntu-app-launch API changes that let upper layers approve whether an application starts.
Specifically, we now take the UAL signals and pass them on to Unity to later approve.
Description of the change
Support new ubuntu-app-launch API changes that let upper layers approve whether an application starts.
Specifically, we now take the UAL signals and pass them on to Unity to later approve.
Related branches:
https:/
https:/
https:/
Unmerged revisions
- 431. By Michael Terry
-
remove some unused code from a bad merge
- 430. By Michael Terry
-
Start porting to app object signals, still won't work
- 429. By Michael Terry
-
Go back to checking start return value
- 428. By Michael Terry
-
Merge from trunk; disabled actual hooks for signals, will fix later
- 427. By Michael Terry
-
Remove/delete app if it is denied, so that its internal state doesn't hang around
- 426. By Michael Terry
-
Update to handle latest unity-api branch
- 425. By Michael Terry
-
Merge from trunk
- 424. By Michael Terry
-
Initial cut of supporting app starting approval api in ubuntu-app-launch
- 423. By Michael Terry
-
Merge more-accurate-mocks
FAILED: Continuous integration, rev:427 jenkins. qa.ubuntu. com/job/ qtmir-ci/ 589/ jenkins. qa.ubuntu. com/job/ qtmir-vivid- amd64-ci/ 285/console jenkins. qa.ubuntu. com/job/ qtmir-vivid- armhf-ci/ 285/console jenkins. qa.ubuntu. com/job/ qtmir-vivid- i386-ci/ 167/console jenkins. qa.ubuntu. com/job/ qtmir-wily- amd64-ci/ 322/console jenkins. qa.ubuntu. com/job/ qtmir-wily- armhf-ci/ 322/console jenkins. qa.ubuntu. com/job/ qtmir-wily- i386-ci/ 167/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtmir- ci/589/ rebuild
http://