Merge lp:~phablet-team/ofono/lp1435784 into lp:~phablet-team/ofono/utopic-rtm

[Tony Espy]

 [ Alfonso Sanchez-Beato ]
  * rilmodem/gprs.c: dynamically set authtype based on credentials (LP: #1435784)

This change causes the type of GPRS authentication to be selected based upon the presence of a username credential in the associated GPRS context record ( aka APN ).

This fixes a BQ customer reported issue where krillin wouldn't establish a data call with a specific Austrian carrier.

https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1435784

Initially tested on mako/RTM #17 with AT&T and T-Mobile (PIN-locked) SIMs, and krillin/vivid-proposed #155 with AT&T SIM. Tested that mobile data could be established on both phones with the afore mentioned SIMs.

[Ricardo Salveti (rsalveti)]

Code looks good, and works fine with my krillin.

Tested with krillin/RTM #257 with VIVO (unlocked SIM). Data could be established without any issues.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-17 22:10:44 +0000
+++ debian/changelog	2015-03-25 21:38:37 +0000
@@ -1,3 +1,10 @@
+ofono (1.12.bzr6890+15.04.20150325.1~rtm-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Alfonso Sanchez-Beato ]
+  * rilmodem/gprs.c: dynamically set authtype based on credentials (LP: #1435784)
+
+ -- CI Train Bot <[e-mail]>  Wed, 25 Mar 2015 17:29:44 -0400
+
 ofono (1.12.bzr6888+15.04.20150217.1~rtm-0ubuntu1) 14.09; urgency=medium
 
   [ Alfonso Sanchez-Beato ]

=== modified file 'drivers/rilmodem/gprs-context.c'
--- drivers/rilmodem/gprs-context.c	2014-07-30 07:30:49 +0000
+++ drivers/rilmodem/gprs-context.c	2015-03-25 21:38:37 +0000
@@ -272,10 +272,16 @@
 	request.username = g_strdup(ctx->username);
 	request.password = g_strdup(ctx->password);
 
-	if (g_ril_vendor(gcd->ril) == OFONO_RIL_VENDOR_MTK)
+	/*
+	 * We do the same as in $AOSP/frameworks/opt/telephony/src/java/com/
+	 * android/internal/telephony/dataconnection/DataConnection.java,
+	 * onConnect(), and use authentication or not depending on whether
+	 * the user field is empty or not.
+	 */
+	if (request.username != NULL && request.username[0] != '\0')
+		request.auth_type = RIL_AUTH_BOTH;
+	else
 		request.auth_type = RIL_AUTH_NONE;
-	else
-		request.auth_type = RIL_AUTH_BOTH;
 
 	request.protocol = ctx->proto;
 	request.req_cid = ctx->cid;