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

[Alfonso Sanchez-Beato]

[ 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/voicecall.c: drop call if radio is not available (LP: #1445580)

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. Drop calls if RADIO_NOT_AVAILABLE returned by rild (LP: 1445580)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Tested on krillin / vivid-proposed #196 and arale / vivid-proposed #18. Checked that bugs are fixed. I was able to see

Apr 24 12:33:54 ubuntu-phablet ofonod[1890]: 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).

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Approving myself to speed things up, as this is blocking the RC.

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-07 06:50:28 +0000
+++ debian/changelog	2015-04-24 09:58:38 +0000
@@ -1,3 +1,14 @@
+ofono (1.12.bzr6894+15.04.20150424-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ 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/voicecall.c: drop call if radio is not available (LP: #1445580)
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Fri, 24 Apr 2015 11:19:08 +0200
+
 ofono (1.12.bzr6892+15.04.20150407-0ubuntu1) vivid; urgency=medium
 
   [ Alfonso Sanchez-Beato ]
 
=== modified file 'drivers/rilmodem/gprs-context.c'
--- drivers/rilmodem/gprs-context.c	2015-03-25 14:49:21 +0000
+++ drivers/rilmodem/gprs-context.c	2015-04-24 09:58:38 +0000
@@ -105,8 +105,7 @@
 	for (iterator = call_list->calls; iterator; iterator = iterator->next) {
 		call = (struct ril_data_call *) iterator->data;
 
-		if ((call->cid == gcd->active_rild_cid) &&
-			gcd->state != STATE_IDLE) {
+		if (call->cid == gcd->active_rild_cid) {
 			active_cid_found = TRUE;
 			DBG("found call - cid: %d", call->cid);
 
@@ -114,19 +113,19 @@
 				DBG("call !active; notify disconnect: %d",
 					call->cid);
 				disconnect = TRUE;
-				ofono_gprs_context_deactivated(gc,
-						       gcd->active_ctx_cid);
 			}
 
 			break;
 		}
 	}
 
-	if (disconnect == TRUE || active_cid_found == FALSE) {
-		DBG("Clearing active context; disconnect: %d"
-			" active_cid_found: %d",
-			disconnect, active_cid_found);
+	if ((disconnect == TRUE || active_cid_found == FALSE)
+		&& gcd->state != STATE_IDLE) {
+		ofono_info("Clearing active context; disconnect: %d"
+			" active_cid_found: %d active_ctx_cid: %d",
+			disconnect, active_cid_found, gcd->active_ctx_cid);
 
+		ofono_gprs_context_deactivated(gc, gcd->active_ctx_cid);
 		set_context_disconnected(gcd);
 	}
 
 
=== modified file 'drivers/rilmodem/voicecall.c'
--- drivers/rilmodem/voicecall.c	2015-02-04 00:09:22 +0000
+++ drivers/rilmodem/voicecall.c	2015-04-24 09:58:38 +0000
@@ -155,7 +155,12 @@
 	GSList *n, *o;
 	struct ofono_call *nc, *oc;
 
-	if (message->error != RIL_E_SUCCESS) {
+	/*
+	 * We consider all calls have been dropped if there is no radio, which
+	 * happens, for instance, when flight mode is set whilst in a call.
+	 */
+	if (message->error != RIL_E_SUCCESS &&
+			message->error != RIL_E_RADIO_NOT_AVAILABLE) {
 		ofono_error("We are polling CLCC and received an error");
 		ofono_error("All bets are off for call management");
 		return;
@@ -176,6 +181,11 @@
 				ofono_voicecall_disconnected(vc, oc->id,
 					OFONO_DISCONNECT_REASON_LOCAL_HANGUP,
 					NULL);
+			} else if (message->error ==
+						RIL_E_RADIO_NOT_AVAILABLE) {
+				ofono_voicecall_disconnected(vc, oc->id,
+					OFONO_DISCONNECT_REASON_ERROR,
+					NULL);
 			} else {
 				/* Get disconnect cause before calling core */
 				struct lastcause_req *reqdata =
 
=== added file 'test/create-ia-context'
--- test/create-ia-context	1970-01-01 00:00:00 +0000
+++ test/create-ia-context	2015-04-24 09:58:38 +0000
@@ -0,0 +1,47 @@
+#!/usr/bin/python3
+
+import sys
+import dbus
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+						'org.ofono.Manager')
+
+modems = manager.GetModems()
+
+for path, properties in modems:
+	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
+		continue
+
+	connman = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.ConnectionManager')
+
+	contexts = connman.GetContexts()
+	path = "";
+
+	for i, properties in contexts:
+		if properties["Type"] == "ia":
+			path = i
+			break
+
+	if path == "":
+		path = connman.AddContext("ia")
+		print("Created new context %s" % (path))
+	else:
+		print("Found context %s" % (path))
+
+	context = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.ConnectionContext')
+
+	if len(sys.argv) > 1:
+		context.SetProperty("AccessPointName", sys.argv[1])
+		print("Setting APN to %s" % (sys.argv[1]))
+
+	if len(sys.argv) > 2:
+		context.SetProperty("Username", sys.argv[2])
+		print("Setting username to %s" % (sys.argv[2]))
+
+	if len(sys.argv) > 3:
+		context.SetProperty("Password", sys.argv[3])
+		print("Setting password to %s" % (sys.argv[3]))