Merge lp://staging/~phablet-team/ofono/mbpi-nettime-plus-oem-fixes into lp://staging/~phablet-team/ofono/ubuntu

Proposed by Tony Espy
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
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/rilmodem/sim.c: notify on SIM removal (LP: #1332306)
  * unit/rilmodem/test-sim-online: fix serial number check (LP: #1334867)
  * plugins/mtk.c: fix race condition when onlining modem
  * build, drivers/infeonmodem, drivers/rilmodem, gril,
    plugins/infeon.c, plugins/ril.*, unit: add Infeon OEM hooks
  * build, plugins/ubuntu-provision.c, ubuntu-apndb.*: re-named
    provisioning plugin code from android-* to ubuntu-*. Also removed
    code that queries mobile-broadband-provider-info's db, and finally
    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-broadband-provider-info apn db during GPRS/MMS provisioning.

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_APNDB_PATH & OFONO_SYSTEM_APNDB_PATH) for test purposes.

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 ).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) :
review: Approve
6871. By Tony Espy

plugins: added debug hooks to ubuntu-provision

6872. By Tony Espy

plugins: fix ubuntu-provision's error logic

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

to all changes: