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
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-03-14 09:11:26 +0000
3+++ debian/changelog 2016-04-13 14:39:45 +0000
4@@ -1,3 +1,10 @@
5+ofono (1.17.bzr6914+16.04.20160413-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Make sure we detach from old contexts in all cases (LP: #1533508)
8+ * Refresh bearer always
9+
10+ -- Alfonso Sanchez-Beato (email Canonical) <alfonso.sanchez-beato@canonical.com> Wed, 13 Apr 2016 16:25:30 +0200
11+
12 ofono (1.17.bzr6912+16.04.20160314.3-0ubuntu1) xenial; urgency=medium
13
14 [ Tony Espy ]
15
16=== modified file 'drivers/rilmodem/gprs.c'
17--- drivers/rilmodem/gprs.c 2015-10-07 07:14:11 +0000
18+++ drivers/rilmodem/gprs.c 2016-04-13 14:39:45 +0000
19@@ -336,12 +336,9 @@
20 }
21 }
22
23- if (gd->tech != reply->reg_state.tech) {
24- gd->tech = reply->reg_state.tech;
25-
26- ofono_gprs_bearer_notify(gprs,
27+ gd->tech = reply->reg_state.tech;
28+ ofono_gprs_bearer_notify(gprs,
29 ril_tech_to_bearer_tech(reply->reg_state.tech));
30- }
31
32 if (cb)
33 CALLBACK_WITH_SUCCESS(cb, reply->reg_state.status, cbd->data);
34
35=== modified file 'src/gprs.c'
36--- src/gprs.c 2015-10-07 07:14:11 +0000
37+++ src/gprs.c 2016-04-13 14:39:45 +0000
38@@ -1703,6 +1703,12 @@
39 release_active_contexts(gprs);
40 gprs->bearer = -1;
41 } else if (have_active_contexts(gprs) == TRUE) {
42+ /*
43+ * Some times the context activates after a detach event and
44+ * right before an attach. We close it to avoid unexpected open
45+ * contexts.
46+ */
47+ release_active_contexts(gprs);
48 gprs->flags |= GPRS_FLAG_ATTACHED_UPDATE;
49 return;
50 }

Subscribers

People subscribed via source and target branches

to all changes: