Merge lp:~rsalveti/phablet-extras/ofono_data_state_tracking into lp:phablet-extras/ofono

[Ricardo Salveti]

rilmodem/gprs.c: adding back state tracking for data network (only when ofono is already attached)

rilmodem/gprs.c: adding back state tracking for data network (only when ofono is already attached)

Adding back some of the logic that was removed when you fixed the roaming bug, as we need to track the data network status anyway (e.g when we get disconnected or when we start roaming).

To avoid a loop when notifying ofono, we only care to check different states if ofono_attached is true (which means we need to tell ofono if something changed). If the device is roaming, ofono_attached will be set to false at the second run, breaking the previous infinite loop logic.

Tested with maguro and I can always get attached, right after boot.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/42/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/67/rebuild

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

I installed the .debs on my nexus4, and confirm that I can still successfully make phone calls, as well as that the "ofonod and rild eating CPU" problem did not come back.

[Dave Morley (davmor2)]

Okay found the debs in the output file. I've installed them, I've reboot and I have a connection. The rild/ofono cpu high percentage issue now seems to be gone. I've disconnected and reconnected several times and they all seemed to of functioned correctly.

review: Approve (tested on maguro device)

[lp:~rsalveti/phablet-extras/ofono_data_state_tracking]

52. By Ricardo Salveti on 2013-07-30

rilmodem/gprs.c fixing coding style

53. By Ricardo Salveti on 2013-07-30

releasing version 1.12phablet11

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/43/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/68/rebuild

review: Approve (continuous-integration)

[Tony Espy (awe)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-26 19:35:06 +0000
+++ debian/changelog	2013-07-30 16:00:00 +0000
@@ -1,3 +1,10 @@
+ofono (1.12phablet11) saucy; urgency=low
+
+  * drivers/rilmodem/gprs.c: adding data network state tracking back, but
+    handling it better to avoid the roaming bug
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Tue, 30 Jul 2013 12:54:37 -0300
+
 ofono (1.12phablet10) saucy; urgency=low
 
   * [rilmodem] Fixed disable GPRS bug (LP:1204644).

=== modified file 'drivers/rilmodem/gprs.c'
--- drivers/rilmodem/gprs.c	2013-07-27 22:51:04 +0000
+++ drivers/rilmodem/gprs.c	2013-07-30 16:00:00 +0000
@@ -67,6 +67,25 @@
 	int rild_status;
 };
 
+static void ril_gprs_registration_status(struct ofono_gprs *gprs,
+					ofono_gprs_status_cb_t cb,
+					void *data);
+
+static void ril_gprs_state_change(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_gprs *gprs = user_data;
+	struct gprs_data *gd = ofono_gprs_get_data(gprs);
+
+	g_assert(message->req == RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED);
+
+	/*
+	 * We are just want to track network data status change if ofono
+	 * itself is attached, so we avoid unnecessary data state requests.
+	 */
+	if (gd->ofono_attached == TRUE)
+		ril_gprs_registration_status(gprs, NULL, NULL);
+}
+
 static void ril_gprs_set_pref_network_cb(struct ril_msg *message,
 						gpointer user_data)
 {
@@ -164,15 +183,25 @@
 		goto error;
 	}
 
-	if (gd->rild_status == -1)
+	if (gd->rild_status == -1) {
 		ofono_gprs_register(gprs);
 
+		/* RILD tracks data network state together with voice */
+		g_ril_register(gd->ril, RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED,
+				ril_gprs_state_change, gprs);
+	}
+
 	if (max_cids > gd->max_cids) {
 		DBG("Setting max cids to %d", max_cids);
 		gd->max_cids = max_cids;
 		ofono_gprs_set_cid_range(gprs, 1, max_cids);
 	}
 
+	/* Just need to notify ofono if it's already attached */
+	if (gd->ofono_attached && (gd->rild_status != status)) {
+		ofono_gprs_status_notify(gprs, status);
+	}
+
 	gd->rild_status = status;
 
 	/*