ofono

Merge lp://qastaging/~phablet-team/ofono/vivid-ww17-update into lp://qastaging/~phablet-team/ofono/ubuntu

  1. vivid-ww17-update
  2. Merge into ubuntu
Proposed by Tony Espy
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 6894
Merge reported by: Tony Espy
Merged at revision: not available
Proposed branch: lp://qastaging/~phablet-team/ofono/vivid-ww17-update
Merge into: lp://qastaging/~phablet-team/ofono/ubuntu
Diff against target: 500 lines (+306/-10) (has conflicts)
11 files modified
debian/changelog (+18/-1)
drivers/rilmodem/gprs-context.c (+7/-8)
drivers/rilmodem/sim.c (+61/-0)
drivers/rilmodem/voicecall.c (+11/-1)
gril/grilreply.c (+32/-0)
gril/grilreply.h (+3/-0)
gril/grilrequest.c (+22/-0)
gril/grilrequest.h (+3/-0)
test/create-ia-context (+47/-0)
unit/test-grilreply.c (+56/-0)
unit/test-grilrequest.c (+46/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://qastaging/~phablet-team/ofono/vivid-ww17-update
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+257204@code.qastaging.launchpad.net

Commit message

  [ Tony Espy ]
  * rilmodem/gprs-context.c: notify if call-list is empty (LP: #1435328)

  [ Alfonso Sanchez-Beato ]
  * test/create-ia-context: new test script to create IA contexts
  * rilmodem/sim.c, gril/grilre*, unit/test-gril*: fix PIN retries (LP: 1436820)
    Fix availability of SIM PIN retry counts on MTK modems.
  * rilmodem/voicecall.c: drop call if radio is not available (LP: #1445580)

Description of the change

This change includes the following fixes/enhancements:

1. Notify the ofono core of a disconnect if a received DATA_CALL_LIST is empty (LP: #1435328)
This is the root cause of many of our mobile data connectivity issues ( but not the only fix, more NM fixes to follow ).

2. A new test script, create-ia-context, has been added to make it easier to test the new IA type, which was added to support LTE.

3. Fix availability of SIM PIN retry counts on MTK-based modems ( arale, krillin ). (LP: #1436820)

4. Drop calls if RADIO_NOT_AVAILABLE returned by rild (LP: 1445580)

To post a comment you must log in.
lp://qastaging/~phablet-team/ofono/vivid-ww17-update updated
6893. By Tony Espy

* rilmodem/gprs-context.c: notify if call-list is empty (LP: #1435328)
* test/create-ia-context: new test script to create IA contexts
* rilmodem/sim.c, gril/grilre*, unit/test-gril*: fix PIN retries (LP: #1436820)
  Fix availability of SIM PIN retry counts on MTK modems.
* rilmodem/voicecall.c: drop call if radio is not available (LP: #1445580)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:6893
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-ofono-ubuntu-ci/69/rebuild

review: Approve (continuous-integration)
lp://qastaging/~phablet-team/ofono/vivid-ww17-update updated
6894. By Ricardo Salveti

Merging trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:6894
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-vivid-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-vivid-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-vivid-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-vivid-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-ofono-ubuntu-ci/70/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Tested on krillin / vivid-proposed #196 and arale / vivid-proposed #180 (device is shown as m75 after flashing with flash tool). Checked that all bugs are fixed. I was able to see

Apr 23 07:27:43 ubuntu-phablet ofonod[1865]: Clearing active context; disconnect: 0 active_cid_found: 0 active_ctx_cid: 1

on krillin, using one SIM, with wifi disabled, when setting flight mode.

Sanity tests (calls/data/SMS) performed.

See comment #8 in bug #1445580 too: this bug needs additional fixes on telephony-service/dialler to be completely solved (although solved on the ofono side with this landing).

Revision history for this message
Tony Espy (awe) wrote :

Changed the status to merged, as the code is now present in trunk.

This branch wasn't merged directly, but in pieces due to a problem caused by the PUK retry fix.

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: