Merge lp:~phablet-team/ofono/lp1363413 into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

  * src/gprs.c: Fix to allow MMS properties to be set (LP: #1362068)
  * rilmodem/sim.c: Fix EnterPIN logic (LP: #1363413)

This change fixes a regression introduced by the last merge request. This happened as even though the SIM portion of the ofono test plan was updated for the previous landing, not all of the manual SIM test cases were runnning, and thus the entering a SIM PIN broke ( lp: #1363413 ).

This change also includes a minor bug fix to allows MMS-specific DBus properties to be set for GPRS context objects that are of type=Internet or type=MMS. This bug fix is required for the new SystemSettings::Cellular APN Editor. None of the existing software on touch uses this DBus method.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6876
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-i386-ci/12

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

review: Approve (continuous-integration)

[Tony Espy (awe)]

Tested silo-018 (utopic) and silo-001 (rtm) on mako (image #26) and krillin (image #17).

Per the ofono test plan, the following testing was done on krillin & mako:

- Basic Tests ( voicecall in/out, sms in/out, working GPRS, ... )
- SIM Tests ( SIM present, SIM !present, SIM removal, ... )

None of the app or indicator autopilot tests were run on either device.

The following regressions were discovered:

[mako] CardIdentifier & PreferredLanguage missing
https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1366229

[krillin] When FlightMode disabled ConnectionManager interface isn't restored
https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1366231
Critical: this prevents restoration of GPRS after FlightMode is disabled

Furthermore two other bugs were found:

Boot with no SIM and FlightMode enabled, no EmergencyNumbers are available
https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1366188

[mako] Only SimManager available when offline & no SIM
https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1366186

[Tony Espy (awe)]

So due to circumstances beyond my control, the rtm silo was published, so in order to keep us in sync, utopic will be published, the code merged, and we'll need to deal with the Critical bug in a subequent landing.

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-20 09:47:55 +0000
+++ debian/changelog	2014-09-04 22:15:56 +0000
@@ -1,3 +1,13 @@
+ofono (1.12.bzr6876+14.10.20140820-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Jussi Kangas ]
+  * src/gprs.c: Fix to allow MMS properties to be set (LP: #1362068)
+
+  [ Tony Espy ]
+  * rilmodem/sim.c: Fix EnterPIN logic (LP: #1363413)
+
+ -- Tony Espy <[e-mail]>  Thu, 04 Sep 2014 17:33:21 -0400
+
 ofono (1.12.bzr6874+14.10.20140820-0ubuntu1) utopic; urgency=medium
 
   [ Martti Piirainen ]

=== modified file 'drivers/rilmodem/sim.c'
--- drivers/rilmodem/sim.c	2014-08-19 16:29:51 +0000
+++ drivers/rilmodem/sim.c	2014-09-04 22:15:56 +0000
@@ -643,17 +643,6 @@
 						sd->ril_state_watch,
 						sd->modem, NULL))
 			ofono_error("Error registering ril sim watch");
-	} else {
-		/* status request afer entering PIN */
-		/*
-		 * TODO: There doesn't seem to be any other
-		 * way to force the core SIM code to
-		 * recheck the PIN.
-		 * Wouldn't __ofono_sim_refresh be
-		 * more appropriate call here??
-		 * __ofono_sim_refresh(sim, NULL, TRUE, TRUE);
-		 */
-		__ofono_sim_recheck_pin(sim);
 	}
 
 	if ((status = g_ril_reply_parse_sim_status(sd->ril, message))
@@ -679,6 +668,14 @@
 			}
 		}
 
+		/*
+		 * Note: There doesn't seem to be any other way to
+		 * force the core SIM code to recheck the PIN. This
+		 * call causes the core to call the this atom's
+		 * query_passwd() function.
+		 */
+		__ofono_sim_recheck_pin(sim);
+
 	} else if (status && status->card_state == RIL_CARDSTATE_ABSENT) {
 		ofono_info("SIM card absent");
 		ofono_sim_inserted_notify(sim, FALSE);

=== modified file 'src/gprs.c'
--- src/gprs.c	2014-04-15 23:42:56 +0000
+++ src/gprs.c	2014-09-04 22:15:56 +0000
@@ -1231,8 +1231,9 @@
 		return pri_set_name(ctx, conn, msg, str);
 	}
 
-	if (ctx->type != OFONO_GPRS_CONTEXT_TYPE_MMS ||
-		ctx->type != OFONO_GPRS_CONTEXT_TYPE_INTERNET)
+	if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_ANY ||
+		ctx->type == OFONO_GPRS_CONTEXT_TYPE_WAP ||
+		ctx->type == OFONO_GPRS_CONTEXT_TYPE_IMS)
 		return __ofono_error_invalid_args(msg);
 
 	if (!strcmp(property, "MessageProxy")) {