Merge lp://qastaging/~morphis/ofono/ota9-wakelock-support into lp://qastaging/~phablet-team/ofono/ubuntu
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~morphis/ofono/ota9-wakelock-support |
Merge into: | lp://qastaging/~phablet-team/ofono/ubuntu |
Prerequisite: | lp://qastaging/~phablet-team/ofono/update-ota9 |
Diff against target: |
566 lines (+464/-6) 8 files modified
Makefile.am (+8/-6) configure.ac (+5/-0) include/wakelock.h (+100/-0) plugins/android-wakelock.c (+194/-0) src/main.c (+4/-0) src/ofono.h (+3/-0) src/voicecall.c (+3/-0) src/wakelock.c (+147/-0) |
To merge this branch: | bzr merge lp://qastaging/~morphis/ofono/ota9-wakelock-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu Phablet Team | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2016-01-15.
Commit message
Bringing wakelock support in from https:/
Description of the change
Bringing wakelock support in from https:/
Unmerged revisions
- 6915. By Simon Fels
-
Disable all rilmodem tests for now as they fail the build
- 6914. By Simon Fels
-
Disable rilmodem-sms unit test
- 6913. By Simon Fels
-
Add further debugging statements
- 6912. By Simon Fels
-
Import wakelock support from https:/
/github. com/rilmodem/ ofono/pull/ 227 - 6911. By Tony Espy
-
Fix test-grilreply set_facilty_lock test
The recent changes for the new test-rilmodem-cb
(call-barring) tests broke test-grilreply.c. This
was due to a re-factoring of the reply parse code
for SET_FACILITY_LOCK requests.This fix has also been submitted as a pull-request
to our upstream git tree: - 6910. By Tony Espy
-
* Fix setting of gril vendor in ril plugin.
* Add unit test test-rilmodem-sms
* Fix parsing of set_facility_lock in grilreply
* Add unit test test-rilmodem-cb
* Simplify upower plugin based on upstream changes
FAILED: Continuous integration, rev:6912 jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- ci/75/ jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- vivid-amd64- ci/13/console jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- vivid-armhf- ci/13 jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- vivid-armhf- ci/13/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- vivid-i386- ci/13
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/phablet- team-ofono- ubuntu- ci/75/rebuild
http://