Merge lp:~phablet-team/ofono/lp1545005 into lp:~phablet-team/ofono/ubuntu

Proposed by Alfonso Sanchez-Beato on 2016-04-13
Status: Merged
Approved by: Tony Espy on 2016-04-13
Approved revision: no longer in the source branch.
Merged at revision: 6914
Proposed branch: lp:~phablet-team/ofono/lp1545005
Merge into: lp:~phablet-team/ofono/ubuntu
Diff against target: 50 lines (+15/-5)
3 files modified
debian/changelog (+7/-0)
drivers/rilmodem/gprs.c (+2/-5)
src/gprs.c (+6/-0)
To merge this branch: bzr merge lp:~phablet-team/ofono/lp1545005
Reviewer Review Type Date Requested Status
Tony Espy 2016-04-13 Approve on 2016-04-13
Review via email: mp+291765@code.launchpad.net

Description of the change

* Make sure we detach from old contexts in all cases (LP: #1533508)
* Refresh bearer always

To post a comment you must log in.
lp:~phablet-team/ofono/lp1545005 updated on 2016-04-13
6914. By CI Train Bot Account on 2016-04-13

* Make sure we detach from old contexts in all cases (LP: #1533508)
* Refresh bearer always

Tony Espy (awe) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-03-14 09:11:26 +0000
+++ debian/changelog 2016-04-13 14:39:45 +0000
@@ -1,3 +1,10 @@
1ofono (1.17.bzr6914+16.04.20160413-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Make sure we detach from old contexts in all cases (LP: #1533508)
4 * Refresh bearer always
5
6 -- Alfonso Sanchez-Beato (email Canonical) <alfonso.sanchez-beato@canonical.com> Wed, 13 Apr 2016 16:25:30 +0200
7
1ofono (1.17.bzr6912+16.04.20160314.3-0ubuntu1) xenial; urgency=medium8ofono (1.17.bzr6912+16.04.20160314.3-0ubuntu1) xenial; urgency=medium
29
3 [ Tony Espy ]10 [ Tony Espy ]
411
=== modified file 'drivers/rilmodem/gprs.c'
--- drivers/rilmodem/gprs.c 2015-10-07 07:14:11 +0000
+++ drivers/rilmodem/gprs.c 2016-04-13 14:39:45 +0000
@@ -336,12 +336,9 @@
336 }336 }
337 }337 }
338338
339 if (gd->tech != reply->reg_state.tech) {339 gd->tech = reply->reg_state.tech;
340 gd->tech = reply->reg_state.tech;340 ofono_gprs_bearer_notify(gprs,
341
342 ofono_gprs_bearer_notify(gprs,
343 ril_tech_to_bearer_tech(reply->reg_state.tech));341 ril_tech_to_bearer_tech(reply->reg_state.tech));
344 }
345342
346 if (cb)343 if (cb)
347 CALLBACK_WITH_SUCCESS(cb, reply->reg_state.status, cbd->data);344 CALLBACK_WITH_SUCCESS(cb, reply->reg_state.status, cbd->data);
348345
=== modified file 'src/gprs.c'
--- src/gprs.c 2015-10-07 07:14:11 +0000
+++ src/gprs.c 2016-04-13 14:39:45 +0000
@@ -1703,6 +1703,12 @@
1703 release_active_contexts(gprs);1703 release_active_contexts(gprs);
1704 gprs->bearer = -1;1704 gprs->bearer = -1;
1705 } else if (have_active_contexts(gprs) == TRUE) {1705 } else if (have_active_contexts(gprs) == TRUE) {
1706 /*
1707 * Some times the context activates after a detach event and
1708 * right before an attach. We close it to avoid unexpected open
1709 * contexts.
1710 */
1711 release_active_contexts(gprs);
1706 gprs->flags |= GPRS_FLAG_ATTACHED_UPDATE;1712 gprs->flags |= GPRS_FLAG_ATTACHED_UPDATE;
1707 return;1713 return;
1708 }1714 }

Subscribers

People subscribed via source and target branches

to all changes: