Merge lp://staging/~phablet-team/ofono/mbpi-nettime-plus-oem-fixes into lp://staging/~phablet-team/ofono/ubuntu
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Tony Espy | ||||||||||||
Approved revision: | 6870 | ||||||||||||
Merged at revision: | 6870 | ||||||||||||
Proposed branch: | lp://staging/~phablet-team/ofono/mbpi-nettime-plus-oem-fixes | ||||||||||||
Merge into: | lp://staging/~phablet-team/ofono/ubuntu | ||||||||||||
Diff against target: |
2623 lines (+1402/-785) 24 files modified
Makefile.am (+6/-3) debian/changelog (+19/-0) drivers/infineonmodem/infineon_constants.h (+77/-0) drivers/rilmodem/sim.c (+68/-1) drivers/rilmodem/vendor.h (+2/-1) gril/grilreply.c (+52/-0) gril/grilreply.h (+10/-0) gril/grilrequest.c (+15/-0) gril/grilrequest.h (+3/-0) gril/parcel.c (+52/-0) gril/parcel.h (+2/-0) plugins/android-apndb.c (+0/-494) plugins/android-apndb.h (+0/-33) plugins/android-provision.c (+0/-227) plugins/infineon.c (+76/-0) plugins/mtk.c (+48/-1) plugins/ril.c (+33/-24) plugins/ril.h (+30/-0) plugins/ubuntu-apndb.c (+596/-0) plugins/ubuntu-apndb.h (+33/-0) plugins/ubuntu-provision.c (+150/-0) test/rilmodem/test-sim-online (+2/-1) unit/test-grilreply.c (+72/-0) unit/test-grilrequest.c (+56/-0) |
||||||||||||
To merge this branch: | bzr merge lp://staging/~phablet-team/ofono/mbpi-nettime-plus-oem-fixes | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alfonso Sanchez-Beato | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+227122@code.staging.launchpad.net |
Commit message
* drivers/
* unit/rilmodem/
* plugins/mtk.c: fix race condition when onlining modem
* build, drivers/
plugins/
* build, plugins/
provisioning plugin code from android-* to ubuntu-*. Also removed
code that queries mobile-
implemented a /custom hook for custom apn dbs (LP: #1315509).
Description of the change
This branch includes the following changes and bug fixes:
1. It removes querying of the mobile-
2. It adds a custom hook to GPRS/MSS provisioning ( see bug #1315509 ).
3. It allows the custom and system apn dbs to be overriden by environment variables ( OFONO_CUSTOM_
4. It adds new OEM hooks which allow enablement of Infeon-based modems.
5. It fixes a race condition with dual-SIM MTK-based modems.
6. The rilmodem driver code now notifies the ofono core when SIM card removal is detected ( see bug #1332306 ).
PASSED: Continuous integration, rev:6870 jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- ci/55/ jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- utopic- amd64-ci/ 12 jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- utopic- armhf-ci/ 9 jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- utopic- armhf-ci/ 9/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ phablet- team-ofono- ubuntu- utopic- i386-ci/ 9
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/phablet- team-ofono- ubuntu- ci/55/rebuild
http://