Merge lp:~phablet-team/ofono/ww10-update into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

[ Alfonso Sanchez-Beato ]
  * mtkmodem/voicecall.c: fix fast call answer (LP: #1422401)
    Fix problem that occurs when calls are answer too quickly.
  * mtk.c: wait for radio event before onlining (LP: #1419675)
    Ensure that the 2nd SIM slot on krillin is always
    initialized properly.
  * gril/grilrequest.c, unit: support empty APN
    Allow data calls with GPRS contexts that have empty APNs.
  * grilreply.c, grilutil.c, ril_constants.c: fix arale parcel parsing
    Fix parcel parsing issues with radio tech and SIM PIN retries.

This branch includes four bug fixes:

1. Fix a problem that occurs when calls are answered too quickly (LP: #1422401)

2. Fix parsing problems on arale with SIM PIN retries and radio technologies

3. Fix an issue where the 2nd slot on krillin isn't always recognized (LP: #1419675; REGRESSION)

4. Allow data calls to be established with GPRS contexts that have no APN specified.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Looks good to me

review: Approve

[Tony Espy (awe)]

Test Results:

1. mako - #111

Tested 'Empty APN' change. Prior to this change, ofono would not send a RIL_REQUEST_SETUP_DATA_CALL for a gprs context with an empty ( ie. "" ) access point name. As none of the operators in the US support this, all I could confirm is that the request is sent.

2. krillin - #122

 - tested fast answer of incoming calls
 - rebooted 12 times to ensure that 2nd SIM is properly recognized
   NOTE - 2 out of 12 attempts, after unlocking the 2nd SIM and then unlocking the phone,
   the 2nd SIM needed to be unlocked a 2nd time. It seems there's a race condition present.
 - verified that radio technology is parsed correctly ( unfortunately it's only ever edge in the US )
 - verified that SIM retries count is properly parsed

3. arale - #103

 - tested fast answer of incoming calls (6 times)
 - rebooted to ensure modem is properly recognized (6 times)
 - verified that radio technology is correct for 2G (edge) and 3G+ (HSPA)
 - verified that SIM PIN retries are parsed correctly

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Test results:

1. arale, vivid-proposed #110

  - SIM PIN retries parsing tested
  - No <INVALID> techs shown in log when ofono is run with debugging on
  - Tested fast answer
  - Sanity testing of outgoing calls and mobile data

2. krillin, 14.09-proposed #245

  - SIM PIN retries parsing tested
  - Tested fast answer
  - Sanity testing of outgoing calls and mobile data
  - Tested empty APN with movistar Spain operator, editing the <IMSI>/gprs file
Verified that the second slot is always recognized (10 reboots). I have not seen the issue with the PIN Tony mentions, although I activated the PIN for the second SIM. The setup was 2 SIMs inserted, and only the second one with PIN. In latest RTM release (#18) a bug appeared due to changes to libqofono: the welcome wizard did not ask for a SIM to be inserted and then reboot (libqofono had changed its behaviour to asynchronous). I wonder if it is the same issue. The unity changes to solve this already landed in RTM, for vivid I have seen they have just landed (line 40 in the spreadsheet), but maybe they are not yet in an image. It might be worth to wait for them and test again.

[Tony Espy (awe)]

Additional test results for krillin - #127:

Performed another 30+ reboots and finally isolated the PIN unlock proplem to unity8 bug:

https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1426876

[Tony Espy (awe)]

Also reported an indicator-network bug discovered during testing:

https://bugs.launchpad.net/ubuntu/+source/indicator-network/+bug/1426467

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-04 09:18:00 +0000
+++ debian/changelog	2015-02-23 18:25:23 +0000
@@ -1,3 +1,18 @@
+ofono (1.12.bzr6888+15.04.20150223-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Alfonso Sanchez-Beato ]
+  * mtkmodem/voicecall.c: fix fast call answer (LP: #1422401)
+    Fix problem that occurs when calls are answer too quickly.
+  * mtk.c: wait for radio event before onlining (LP: #1419675)
+    Ensure that the 2nd SIM slot on krillin is always
+    initialized properly.
+  * gril/grilrequest.c, unit: support empty APN
+    Allow data calls with GPRS contexts that have empty APNs.
+  * grilreply.c, grilutil.c, ril_constants.c: fix arale parcel parsing
+    Fix parcel parsing issues with radio tech and SIM PIN retries.
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 23 Feb 2015 12:45:21 -0500
+
 ofono (1.12.bzr6886+15.04.20150204-0ubuntu1) vivid; urgency=medium
 
   [ Tony Espy ]

=== modified file 'drivers/mtkmodem/voicecall.c'
--- drivers/mtkmodem/voicecall.c	2015-01-13 13:14:13 +0000
+++ drivers/mtkmodem/voicecall.c	2015-02-23 18:25:23 +0000
@@ -57,15 +57,11 @@
 	struct ofono_voicecall *vc = user_data;
 	struct ril_voicecall_data *vd = ofono_voicecall_get_data(vc);
 
-	if (message->error == RIL_E_SUCCESS) {
+	if (message->error == RIL_E_SUCCESS)
 		g_ril_print_response_no_args(vd->ril, message);
-
-		/* Request the call list again */
-		ril_poll_clcc(vc);
-	} else {
+	else
 		ofono_error("%s: RIL error %s", __func__,
 				ril_error_to_string(message->error));
-	}
 }
 
 static void mtk_incoming_notify(struct ril_msg *message, gpointer user_data)

=== modified file 'gril/grilreply.c'
--- gril/grilreply.c	2015-02-04 00:09:22 +0000
+++ gril/grilreply.c	2015-02-23 18:25:23 +0000
@@ -332,9 +332,33 @@
 		g_ril_append_print_buf(gril, "%s0x%x", print_buf, val);
 		break;
 	case RST_IX_RAT:
-		reply->tech = val;
 		g_ril_append_print_buf(gril, "%s%s", print_buf,
 					ril_radio_tech_to_string(val));
+
+		if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+			switch (val) {
+			case MTK_RADIO_TECH_HSDPAP:
+			case MTK_RADIO_TECH_HSDPAP_UPA:
+			case MTK_RADIO_TECH_HSUPAP:
+			case MTK_RADIO_TECH_HSUPAP_DPA:
+				val = RADIO_TECH_HSPAP;
+				break;
+			case MTK_RADIO_TECH_DC_DPA:
+				val = RADIO_TECH_HSDPA;
+				break;
+			case MTK_RADIO_TECH_DC_UPA:
+				val = RADIO_TECH_HSUPA;
+				break;
+			case MTK_RADIO_TECH_DC_HSDPAP:
+			case MTK_RADIO_TECH_DC_HSDPAP_UPA:
+			case MTK_RADIO_TECH_DC_HSDPAP_DPA:
+			case MTK_RADIO_TECH_DC_HSPAP:
+				val = RADIO_TECH_HSPAP;
+				break;
+			}
+		}
+
+		reply->tech = val;
 		break;
 	default:
 		goto no_val;
@@ -1305,22 +1329,36 @@
 		g_ril_append_print_buf(gril, "{%d}", retries[passwd_type]);
 		break;
 	case OFONO_RIL_VENDOR_MTK:
-		if (numint != 4) {
-			ofono_error("%s: wrong format", __func__);
-			goto no_data;
-		}
-
-		retries[OFONO_SIM_PASSWORD_SIM_PIN] = parcel_r_int32(&rilp);
-		retries[OFONO_SIM_PASSWORD_SIM_PIN2] = parcel_r_int32(&rilp);
-		retries[OFONO_SIM_PASSWORD_SIM_PUK] = parcel_r_int32(&rilp);
-		retries[OFONO_SIM_PASSWORD_SIM_PUK2] = parcel_r_int32(&rilp);
-
-		g_ril_append_print_buf(gril,
+		/*
+		 * Some versions of MTK modem return just the retries for the
+		 * password just entered while others return the retries for all
+		 * passwords.
+		 */
+		if (numint == 1) {
+			retries[passwd_type] = parcel_r_int32(&rilp);
+
+			g_ril_append_print_buf(gril, "{%d}",
+							retries[passwd_type]);
+		} else if (numint == 4) {
+			retries[OFONO_SIM_PASSWORD_SIM_PIN] =
+							parcel_r_int32(&rilp);
+			retries[OFONO_SIM_PASSWORD_SIM_PIN2] =
+							parcel_r_int32(&rilp);
+			retries[OFONO_SIM_PASSWORD_SIM_PUK] =
+							parcel_r_int32(&rilp);
+			retries[OFONO_SIM_PASSWORD_SIM_PUK2] =
+							parcel_r_int32(&rilp);
+
+			g_ril_append_print_buf(gril,
 					"{pin %d, pin2 %d, puk %d, puk2 %d}",
 					retries[OFONO_SIM_PASSWORD_SIM_PIN],
 					retries[OFONO_SIM_PASSWORD_SIM_PIN2],
 					retries[OFONO_SIM_PASSWORD_SIM_PUK],
 					retries[OFONO_SIM_PASSWORD_SIM_PUK2]);
+		} else {
+			ofono_error("%s: wrong format", __func__);
+			goto no_data;
+		}
 		break;
 	case OFONO_RIL_VENDOR_INFINEON:
 		ofono_error("%s: infineon type should not arrive here",

=== modified file 'gril/grilrequest.c'
--- gril/grilrequest.c	2015-01-28 13:58:34 +0000
+++ gril/grilrequest.c	2015-02-23 18:25:23 +0000
@@ -240,7 +240,6 @@
 	gchar *tech_str;
 	gchar *auth_str;
 	gchar *profile_str;
-	size_t apn_len;
 	int num_param = SETUP_DATA_CALL_PARAMS;
 
 	DBG("");
@@ -295,14 +294,6 @@
 	if (req->apn == NULL)
 		goto error;
 
-	apn_len = strlen(req->apn);
-	if (apn_len == 0 || apn_len > 100) {
-		ofono_error("%s: invalid apn length: %d",
-				__func__,
-				(int) apn_len);
-		goto error;
-	}
-
 	if (req->auth_type > RIL_AUTH_BOTH) {
 		ofono_error("%s: Invalid auth type: %d",
 				__func__,

=== modified file 'gril/grilutil.c'
--- gril/grilutil.c	2015-01-28 13:58:34 +0000
+++ gril/grilutil.c	2015-02-23 18:25:23 +0000
@@ -266,6 +266,26 @@
 		return "HSPAP";
 	case RADIO_TECH_GSM:
 		return "GSM";
+	case MTK_RADIO_TECH_HSDPAP:
+		return "MTK_HSDPAP";
+	case MTK_RADIO_TECH_HSDPAP_UPA:
+		return "MTK_HSDPAP_UPA";
+	case MTK_RADIO_TECH_HSUPAP:
+		return "MTK_HSUPAP";
+	case MTK_RADIO_TECH_HSUPAP_DPA:
+		return "MTK_HSUPAP_DPA";
+	case MTK_RADIO_TECH_DC_DPA:
+		return "MTK_DC_DPA";
+	case MTK_RADIO_TECH_DC_UPA:
+		return "MTK_DC_UPA";
+	case MTK_RADIO_TECH_DC_HSDPAP:
+		return "MTK_DC_HSDPAP";
+	case MTK_RADIO_TECH_DC_HSDPAP_UPA:
+		return "MTK_DC_HSDPAP_UPA";
+	case MTK_RADIO_TECH_DC_HSDPAP_DPA:
+		return "MTK_DC_HSDPAP_DPA";
+	case MTK_RADIO_TECH_DC_HSPAP:
+		return "MTK_DC_HSPAP";
 	default:
 		if (g_snprintf(temp_str, sizeof(temp_str),
 				"<INVALID (%d)>",

=== modified file 'gril/ril_constants.h'
--- gril/ril_constants.h	2015-01-29 14:50:30 +0000
+++ gril/ril_constants.h	2015-02-23 18:25:23 +0000
@@ -139,6 +139,18 @@
 #define RADIO_TECH_LTE 14
 #define RADIO_TECH_HSPAP 15
 #define RADIO_TECH_GSM 16
+/* MTK specific values for radio technologies */
+#define MTK_RADIO_TECH_BASE 128
+#define MTK_RADIO_TECH_HSDPAP (MTK_RADIO_TECH_BASE + 1)
+#define MTK_RADIO_TECH_HSDPAP_UPA (MTK_RADIO_TECH_BASE + 2)
+#define MTK_RADIO_TECH_HSUPAP (MTK_RADIO_TECH_BASE + 3)
+#define MTK_RADIO_TECH_HSUPAP_DPA (MTK_RADIO_TECH_BASE + 4)
+#define MTK_RADIO_TECH_DC_DPA (MTK_RADIO_TECH_BASE + 5)
+#define MTK_RADIO_TECH_DC_UPA (MTK_RADIO_TECH_BASE + 6)
+#define MTK_RADIO_TECH_DC_HSDPAP (MTK_RADIO_TECH_BASE + 7)
+#define MTK_RADIO_TECH_DC_HSDPAP_UPA (MTK_RADIO_TECH_BASE + 8)
+#define MTK_RADIO_TECH_DC_HSDPAP_DPA (MTK_RADIO_TECH_BASE + 9)
+#define MTK_RADIO_TECH_DC_HSPAP (MTK_RADIO_TECH_BASE + 10)
 
 /* See RIL_REQUEST_LAST_CALL_FAIL_CAUSE */
 #define CALL_FAIL_UNOBTAINABLE_NUMBER 1

=== modified file 'plugins/mtk.c'
--- plugins/mtk.c	2015-01-29 14:50:30 +0000
+++ plugins/mtk.c	2015-02-23 18:25:23 +0000
@@ -133,6 +133,8 @@
 	ofono_bool_t has_3g;
 	struct mtk_settings_data *mtk_settings;
 	int fw_type;
+	ofono_modem_online_cb_t online_cb;
+	void *online_data;
 };
 
 /*
@@ -249,7 +251,7 @@
 	if (radio_state != sock->radio_state) {
 		struct socket_data *sock_c = socket_complement(sock);
 
-		ofono_info("%s, state: %s", __func__,
+		ofono_info("%s, %s, state: %s", __func__, sock->path,
 				ril_radio_state_to_string(radio_state));
 
 		/*
@@ -278,6 +280,7 @@
 								message);
 
 	if (radio_state != md->radio_state) {
+		gboolean success = FALSE;
 
 		ofono_info("%s, slot %d: state: %s md->ofono_online: %d",
 				__func__, md->slot,
@@ -288,23 +291,35 @@
 
 		switch (radio_state) {
 		case RADIO_STATE_ON:
-		/* MTK */
+		/* Deprecated in AOSP, but still used by MTK */
 		case RADIO_STATE_SIM_NOT_READY:
 		case RADIO_STATE_SIM_LOCKED_OR_ABSENT:
 		case RADIO_STATE_SIM_READY:
+			if (md->ofono_online)
+				success = TRUE;
 			break;
 
 		case RADIO_STATE_UNAVAILABLE:
 		case RADIO_STATE_OFF:
-			if (md->ofono_online) {
-				ofono_warn("%s, slot %d: radio powered off!",
-						__func__, md->slot);
-			}
+			if (!md->ofono_online)
+				success = TRUE;
 			break;
 		default:
 			/* Malformed parcel; no radio state == broken rild */
 			g_assert(FALSE);
 		}
+
+		if (md->online_cb != NULL) {
+			if (success)
+				CALLBACK_WITH_SUCCESS(md->online_cb,
+							md->online_data);
+			else
+				CALLBACK_WITH_FAILURE(md->online_cb,
+							md->online_data);
+
+			md->online_cb = NULL;
+			md->online_data = NULL;
+		}
 	}
 }
 
@@ -762,7 +777,20 @@
 	if (message->error == RIL_E_SUCCESS) {
 		g_ril_print_response_no_args(md->ril, message);
 
-		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+		/*
+		 * Although the request was successful, radio state might not
+		 * have changed yet. In that case we wait for the radio event,
+		 * otherwise RIL requests that depend on radio state will fail.
+		 */
+		if ((md->ofono_online && md->radio_state != RADIO_STATE_OFF) ||
+				(!md->ofono_online &&
+					md->radio_state == RADIO_STATE_OFF)) {
+			CALLBACK_WITH_SUCCESS(cb, cbd->data);
+		} else {
+			/* Wait for the radio state event */
+			md->online_cb = cb;
+			md->online_data = cbd->data;
+		}
 	} else {
 		ofono_error("%s: RIL error %s", __func__,
 				ril_error_to_string(message->error));

=== modified file 'unit/test-grilrequest.c'
--- unit/test-grilrequest.c	2015-02-04 00:09:22 +0000
+++ unit/test-grilrequest.c	2015-02-23 18:25:23 +0000
@@ -107,26 +107,13 @@
 static const struct req_setup_data_call req_setup_data_call_invalid_5 = {
 	.tech = RADIO_TECH_GPRS,
 	.data_profile = RIL_DATA_PROFILE_DEFAULT,
-	.apn = "",
+	.apn = "test.apn",
+	.auth_type = 4,
 };
 
 static const struct req_setup_data_call req_setup_data_call_invalid_6 = {
 	.tech = RADIO_TECH_GPRS,
 	.data_profile = RIL_DATA_PROFILE_DEFAULT,
-	.apn = "12345678901234567890123456789012345678901234567890"
-		"123456789012345678901234567890123456789012345678901",
-};
-
-static const struct req_setup_data_call req_setup_data_call_invalid_7 = {
-	.tech = RADIO_TECH_GPRS,
-	.data_profile = RIL_DATA_PROFILE_DEFAULT,
-	.apn = "test.apn",
-	.auth_type = 4,
-};
-
-static const struct req_setup_data_call req_setup_data_call_invalid_8 = {
-	.tech = RADIO_TECH_GPRS,
-	.data_profile = RIL_DATA_PROFILE_DEFAULT,
 	.apn = "test.apn",
 	.auth_type = RIL_AUTH_BOTH,
 	.protocol = 3,
@@ -173,6 +160,19 @@
 	.protocol = OFONO_GPRS_PROTO_IPV6,
 };
 
+static const struct req_setup_data_call req_setup_data_call_valid_5 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "",
+};
+
+static const struct req_setup_data_call req_setup_data_call_valid_6 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "12345678901234567890123456789012345678901234567890"
+		"123456789012345678901234567890123456789012345678901",
+};
+
 static const char sim_read_info_path_valid_1[] = {0x3F, 0x00};
 
 static const struct req_sim_read_info req_sim_read_info_valid_1 = {
@@ -1473,16 +1473,6 @@
 				test_request_setup_data_call_invalid);
 
 	g_test_add_data_func("/testgrilrequest/gprs-context: "
-				"invalid SETUP_DATA_CALL Test 7",
-				&req_setup_data_call_invalid_7,
-				test_request_setup_data_call_invalid);
-
-	g_test_add_data_func("/testgrilrequest/gprs-context: "
-				"invalid SETUP_DATA_CALL Test 8",
-				&req_setup_data_call_invalid_8,
-				test_request_setup_data_call_invalid);
-
-	g_test_add_data_func("/testgrilrequest/gprs-context: "
 				"valid SETUP_DATA_CALL Test 1",
 				&req_setup_data_call_valid_1,
 				test_request_setup_data_call_valid);
@@ -1502,6 +1492,16 @@
 				&req_setup_data_call_valid_4,
 				test_request_setup_data_call_valid);
 
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"valid SETUP_DATA_CALL Test 5",
+				&req_setup_data_call_valid_5,
+				test_request_setup_data_call_valid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"valid SETUP_DATA_CALL Test 6",
+				&req_setup_data_call_valid_6,
+				test_request_setup_data_call_valid);
+
 	g_test_add_data_func("/testgrilrequest/power: "
 				"valid POWER Test 1",
 				&power_valid_test_1,