Merge lp:~phablet-team/ofono/rtm-bug-fix-update-1 into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

* gril, unit: fix indicator-network crash (LP: #1368675)
   RIL defines a set of network registration states for emergency
   calling that don't map directly to ofono's states. This results
   in NetworkRegistration Status not being set at all, which in
   turn crashes the indicator.
* include, plugins/mtk.c, src/modem.c,sim.c: Fix PUK crash (LP: #1365481)
   If the SIM gets locked in particular sequence, ofono will crash
   while trying to free the list of SIM SPN watch events ( which
   have already been freed ). MTK fix is a bit more involved than
   the stanard RIL logic.
* plugins/mtk.c,ril.c: Show emergency numbers in flight-mode (LP: #1366188)
   Modify plugin logic to create the SimManager interface even if
   no SIM is present.
* plugins/ubuntu-apndb.c: allow MMS APNs w/out proxy (LP: #1362008)
  Prior to this change, MMS APNs w/out a proxy were skipped.
  Now APNs are skipped if message center is missing, which makes
  more sense.
* rilmodem/gprs.c: fix crash due to stale timer event (LP: # 1373351)
  A 5s timer is set to retry a STATUS request to RIL, however if
  FlightMode is enabled, the gprs atom is destroyed, and the pending
  timer callback has a stale gprs reference. Now the timer id is
  stored, and when the atom destroyed, the timer event is cancelled.
* mtkmodem/radio-setttings.c: fix RadioSettings creation (LP: #1374029 )
  If the MTK modem returns a RADIO_NOT_AVAIL error in response
  to a FastDormany RIL request, the RadioSetting initialization
  callback sequence is broken, and thus the RadioSettings interface
  isn't created. This in turn prevents powerd from enabling
  FastDorancy whenever the screen is turned off, and also has
  implications for system-settings too.

RTM bug fix update for ofono.

Fixes one SIM related crash, and one issue which prevents emergency calls if no SIM is installed, and one NetworkRegistration fix for an indicator-network crash.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Aside from the debian/changelog comment, I don't think much more review is needed as this is just a release review.

[lp:~phablet-team/ofono/rtm-bug-fix-update-1]

6880. By Tony Espy on 2014-09-23

plugins/ubuntu-apndb.c: allow MMS APNs w/out proxy (LP: #1362008)
Prior to this change, MMS APNs w/out a proxy were skipped.
Now APNs are skipped if message center is missing, which makes
more sense.

6881. By Tony Espy on 2014-09-23

Correct latest version to -0ubuntu1

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Given
$ grep -R onfo|grep -v confor
debian/changelog: calling that don't map directly to onfo's states. This results

and that this was uploaded to phablet-team, I'm taking the liberty of modifying that typo to 'ofono'

[lp:~phablet-team/ofono/rtm-bug-fix-update-1]

6882. By Sergio Schvezov on 2014-09-23

debian/changelog: s/ofno/ofono/

[Sergio Schvezov (sergiusens)]

review: Approve

[Tony Espy (awe)]

I tested the package from rtm silo-007 on krillin w/RTM image #59 installed.

https://wiki.ubuntu.com/Process/Merges/TestPlans/ofono

I ran:

1. Basic Tests
I did see some weird dialer behavior ( no call time-counter, remote hang-ups didn't dismiss the call-in-progress page ) which seems intermittent. Also an incoming call when the device is locked doesn't seem to work very well at all. Other than that all of the basic tests pass.

2. SIM Tests
I ran the SIM tests section of the ofono test plan

3. I verified bug LP: #1366188 - Emergency Numbers not shown in FlightMode

4. I tried to run the dialer-app autopilot tests, and ended up with 6 failures. This seems consistent with the daily results.

5. I am seeing a new ofonod crash, so this will need to be investigated before we can land these changes.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

I can confirm that bug #1365481 is fixed with this MP.

[Sergio Schvezov (sergiusens)]

Provisioning of proxyless MMS contexts works with this, tested with:

env OFONO_CUSTOM_MCC=208
env OFONO_CUSTOM_MNC=15

Solves the ofono side of bug #1362008

review: Approve

[Tony Espy (awe)]

Image RTM/#59:

So I can reproduce the crash mentioned above. I'm testing the new urfkill ( including the device-side changes ), indicator-network, and ofono from the silo associated with this merge.

Without the new ofono, no ofonod crashes.

With it, playing around with flight-mode for a little while, with at least one reboot caused the crash in ril_gprs_registration_status() caused by a NULL pointer returned by ofono_gprs_get_data(gprs).

review: Needs Fixing

[Tony Espy (awe)]

Turns out this is not a regression directly caused by these changes. That said, we should have an update first thing tomorrow based upon the work/comments in the following pull request:

https://github.com/rilmodem/ofono/pull/122

and the following bug:

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

review: Approve

[lp:~phablet-team/ofono/rtm-bug-fix-update-1]

6883. By Tony Espy on 2014-09-26

* rilmodem/gprs.c: fix crash due to stale timer event (LP: # 1373351)
  A 5s timer is set to retry a STATUS request to RIL, however if
  FlightMode is enabled, the gprs atom is destroyed, and the pending
  timer callback has a stale gprs reference. Now the timer id is
  stored, and when the atom destroyed, the timer event is cancelled.
* mtkmodem/radio-setttings.c: fix RadioSettings creation (LP: #1374029 )
  If the MTK modem returns a RADIO_NOT_AVAIL error in response
  to a FastDormany RIL request, the RadioSetting initialization
  callback sequence is broken, and thus the RadioSettings interface
  isn't created. This in turn prevents powerd from enabling
  FastDorancy whenever the screen is turned off, and also has
  implications for system-settings too.

[Tony Espy (awe)]

Image RTM/#59 + ofono from rtm-silo-007 ( 1.12.bzr6878+14.10.20140926-0ubuntu1 ):

No more ofono crashes during FlightMode testing and multiple reboots.

Also verified that RadioSettings is always created and verified that the new code path works via the presence of a new log message.

review: Approve

[Tony Espy (awe)]

Note, the previous comment didn't specify the device, which was krillin.

mako + image Utopic/#257 + ofono from utopic-silo-024 ( 1.12.bzr6878+14.10.20140926-0ubuntu1 ):

Sanity checked basic tests ( voice in/out, sms in/out, sms&voice wake device, gprs works ).

Looks good.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-04 22:31:59 +0000
+++ debian/changelog	2014-09-26 14:35:25 +0000
@@ -1,3 +1,44 @@
+ofono (1.12.bzr6878+14.10.20140904-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Alfonso Sanchez-Beato ]
+  * include, plugins/mtk.c, src/modem.c,sim.c: Fix PUK crash (LP: #1365481)
+    If the SIM gets locked in particular sequence, ofono will crash
+    while trying to free the list of SIM SPN watch events ( which
+    have already been freed ).  MTK fix is a bit more involved than
+    the stanard RIL logic.
+
+  * plugins/mtk.c,ril.c: Show emergency numbers in flight-mode (LP: #1366188)
+    Modify plugin logic to create the SimManager interface even if
+    no SIM is present.
+
+  * gril, unit: fix indicator-network crash (LP: #1368675)
+    RIL defines a set of network registration states for emergency
+    calling that don't map directly to ofono's states.  This results
+    in NetworkRegistration Status not being set at all, which in
+    turn crashes the indicator.
+
+  * rilmodem/gprs.c: fix crash due to stale timer event (LP: # 1373351)
+    A 5s timer is set to retry a STATUS request to RIL, however if
+    FlightMode is enabled, the gprs atom is destroyed, and the pending
+    timer callback has a stale gprs reference.  Now the timer id is
+    stored, and when the atom destroyed, the timer event is cancelled.
+
+  * mtkmodem/radio-setttings.c: fix RadioSettings creation (LP: #1374029 )
+    If the MTK modem returns a RADIO_NOT_AVAIL error in response
+    to a FastDormany RIL request, the RadioSetting initialization
+    callback sequence is broken, and thus the RadioSettings interface
+    isn't created.  This in turn prevents powerd from enabling
+    FastDorancy whenever the screen is turned off, and also has
+    implications for system-settings too.
+
+  [ Tony Espy ]
+  * plugins/ubuntu-apndb.c: allow MMS APNs w/out proxy (LP: #1362008)
+    Prior to this change, MMS APNs w/out a proxy were skipped.
+    Now APNs are skipped if message center is missing, which makes
+    more sense.
+
+ -- Ubuntu daily release <[e-mail]>  Sat, 20 Sep 2014 14:40:37 -0400
+
 ofono (1.12.bzr6876+14.10.20140904-0ubuntu1) utopic; urgency=medium
 
   [ Jussi Kangas ]

=== modified file 'drivers/mtkmodem/radio-settings.c'
--- drivers/mtkmodem/radio-settings.c	2014-07-28 07:12:26 +0000
+++ drivers/mtkmodem/radio-settings.c	2014-09-26 14:35:25 +0000
@@ -63,7 +63,13 @@
 	struct radio_data *rsd = ofono_radio_settings_get_data(rs);
 	ofono_radio_settings_fast_dormancy_set_cb_t cb = cbd->cb;
 
-	if (message->error == RIL_E_SUCCESS) {
+	if (message->error == RIL_E_SUCCESS ||
+			message->error == RIL_E_RADIO_NOT_AVAILABLE) {
+
+		if (message->error == RIL_E_RADIO_NOT_AVAILABLE)
+			ofono_warn("Could not set fast dormancy "
+					"as radio is not available");
+
 		g_ril_print_response_no_args(rsd->ril, message);
 		ril_set_fast_dormancy(rs, user->on, cb, cbd->data);
 	} else {

=== modified file 'drivers/rilmodem/gprs.c'
--- drivers/rilmodem/gprs.c	2014-04-29 17:35:03 +0000
+++ drivers/rilmodem/gprs.c	2014-09-26 14:35:25 +0000
@@ -160,6 +160,9 @@
 static gboolean ril_get_status_retry(gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;
+	struct ril_gprs_data *gd = ofono_gprs_get_data(gprs);
+
+	gd->status_retry_cb_id = 0;
 
 	ril_gprs_registration_status(gprs, NULL, NULL);
 
@@ -302,7 +305,9 @@
 	 * are registered in the voice network.
 	 */
 	if (old_status == -1 && message->error == RIL_E_GENERIC_FAILURE)
-		g_timeout_add(GET_STATUS_TIMER_MS, ril_get_status_retry, gprs);
+		gd->status_retry_cb_id =
+			g_timeout_add(GET_STATUS_TIMER_MS,
+					ril_get_status_retry, gprs);
 
 	if (cb)
 		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
@@ -449,6 +454,9 @@
 
 	DBG("");
 
+	if (gd->status_retry_cb_id != 0)
+		g_source_remove(gd->status_retry_cb_id);
+
 	ofono_gprs_set_data(gprs, NULL);
 
 	g_ril_unref(gd->ril);

=== modified file 'drivers/rilmodem/gprs.h'
--- drivers/rilmodem/gprs.h	2014-07-31 06:45:32 +0000
+++ drivers/rilmodem/gprs.h	2014-09-26 14:35:25 +0000
@@ -28,6 +28,7 @@
 	int tech;
 	int state_changed_unsol;
 	int pending_deact_req;
+	guint status_retry_cb_id;
 };
 
 int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *data);

=== modified file 'gril/gril.c'
--- gril/gril.c	2014-08-14 08:12:16 +0000
+++ gril/gril.c	2014-09-26 14:35:25 +0000
@@ -467,8 +467,8 @@
 
 	/* Only log events not being listended for... */
 	if (!found)
-		DBG("RIL Event: %s\n",
-			unsol_request_to_string(p, message->req));
+		DBG("RIL Event slot %d: %s\n",
+			p->slot, unsol_request_to_string(p, message->req));
 
 	p->in_notify = FALSE;
 

=== modified file 'gril/grilreply.c'
--- gril/grilreply.c	2014-07-31 23:41:36 +0000
+++ gril/grilreply.c	2014-09-26 14:35:25 +0000
@@ -45,6 +45,8 @@
 
 #define OPERATOR_NUM_PARAMS 3
 
+#define MTK_MODEM_MAX_CIDS 3
+
 static void ril_reply_free_operator(gpointer data)
 {
 	struct reply_operator *reply = data;
@@ -272,11 +274,12 @@
 
 {
 	struct parcel rilp;
-	int tmp;
+	int tmp, status;
 	char *sstatus = NULL, *slac = NULL, *sci = NULL;
 	char *stech = NULL, *sreason = NULL, *smax = NULL;
 	struct reply_reg_state *reply;
 	char *endp;
+	const char *strstate;
 
 	DBG("");
 
@@ -338,12 +341,21 @@
 	 * voice & data response.
 	 */
 	if (tmp--) {
-		sreason = parcel_r_string(&rilp);        /* TODO: different use for CDMA */
+		/* TODO: different use for CDMA */
+		sreason = parcel_r_string(&rilp);
 
 		if (tmp--) {
-			smax = parcel_r_string(&rilp);           /* TODO: different use for CDMA */
+			/* TODO: different use for CDMA */
+			smax = parcel_r_string(&rilp);
 
-			if (smax)
+			/*
+			 * MTK modem does not return max_cids, string for this
+			 * index actually contains the maximum data bearer
+			 * capability.
+			 */
+			if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+				reply->max_cids = MTK_MODEM_MAX_CIDS;
+			else if (smax)
 				reply->max_cids = atoi(smax);
 		}
 	}
@@ -356,7 +368,33 @@
 		goto error;
 	}
 
-	reply->status = atoi(sstatus);
+	status = atoi(sstatus);
+
+	switch (status) {
+	case RIL_REG_STATE_NOT_REGISTERED:
+	case RIL_REG_STATE_REGISTERED:
+	case RIL_REG_STATE_SEARCHING:
+	case RIL_REG_STATE_DENIED:
+	case RIL_REG_STATE_UNKNOWN:
+	case RIL_REG_STATE_ROAMING:
+		/* Only valid values for ofono */
+		reply->status = status;
+		strstate = registration_status_to_string(status);
+		break;
+	case RIL_REG_STATE_EMERGENCY_NOT_REGISTERED:
+	case RIL_REG_STATE_EMERGENCY_SEARCHING:
+	case RIL_REG_STATE_EMERGENCY_DENIED:
+	case RIL_REG_STATE_EMERGENCY_UNKNOWN:
+		/* Map to states valid for ofono core */
+		reply->status = status - RIL_REG_STATE_EMERGENCY_NOT_REGISTERED;
+		strstate = sstatus;
+		break;
+	default:
+		reply->status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
+		strstate = sstatus;
+		ofono_error("%s: Error unknown status code (%s)",
+				__func__, sstatus);
+	}
 
 
 	if (slac)
@@ -386,12 +424,12 @@
 
 	g_ril_append_print_buf(gril,
 				"{%s,%s,%s,%s,%s,%s}",
-				registration_status_to_string(reply->status),
+				strstate,
 				slac,
 				sci,
 				ril_radio_tech_to_string(reply->tech),
 				sreason,
-				smax);
+				smax ? smax : "NULL");
 
 	g_ril_print_response(gril, message);
 

=== modified file 'gril/ril_constants.h'
--- gril/ril_constants.h	2014-07-29 06:11:22 +0000
+++ gril/ril_constants.h	2014-09-26 14:35:25 +0000
@@ -359,4 +359,16 @@
 /* Suplementary services Service class*/
 #define SERVICE_CLASS_NONE 0
 
+/* Network registration states */
+#define RIL_REG_STATE_NOT_REGISTERED 0
+#define RIL_REG_STATE_REGISTERED 1
+#define RIL_REG_STATE_SEARCHING 2
+#define RIL_REG_STATE_DENIED 3
+#define RIL_REG_STATE_UNKNOWN 4
+#define RIL_REG_STATE_ROAMING 5
+#define RIL_REG_STATE_EMERGENCY_NOT_REGISTERED 10
+#define RIL_REG_STATE_EMERGENCY_SEARCHING 12
+#define RIL_REG_STATE_EMERGENCY_DENIED 13
+#define RIL_REG_STATE_EMERGENCY_UNKNOWN 14
+
 #endif /*__RIL_CONSTANTS_H*/

=== modified file 'include/modem.h'
--- include/modem.h	2012-11-02 19:02:26 +0000
+++ include/modem.h	2014-09-26 14:35:25 +0000
@@ -112,6 +112,10 @@
 ofono_bool_t ofono_modem_get_boolean(struct ofono_modem *modem,
 					const char *key);
 
+void ofono_modem_set_driver_watches_sim(struct ofono_modem *modem,
+					ofono_bool_t value);
+ofono_bool_t ofono_modem_get_driver_watches_sim(struct ofono_modem *modem);
+
 int ofono_modem_driver_register(const struct ofono_modem_driver *);
 void ofono_modem_driver_unregister(const struct ofono_modem_driver *);
 

=== modified file 'plugins/mtk.c'
--- plugins/mtk.c	2014-08-19 15:03:08 +0000
+++ plugins/mtk.c	2014-09-26 14:35:25 +0000
@@ -94,10 +94,20 @@
 	int slot;
 	struct ril_sim_data sim_data;
 	struct ofono_devinfo *devinfo;
+	struct ofono_voicecall *voicecall;
+	struct ofono_call_volume *callvolume;	
 	struct cb_data *pending_online_cbd;
 	ofono_bool_t pending_online;
 	ofono_bool_t gprs_attach;
 	int rild_connect_retries;
+	struct ofono_sms *sms;
+	struct ofono_netreg *netreg;
+	struct ofono_ussd *ussd;
+	struct ofono_call_settings *call_settings;
+	struct ofono_call_forwarding *call_forwarding;
+	struct ofono_call_barring *call_barring;
+	struct ofono_gprs *gprs;
+	struct ofono_message_waiting *message_waiting;
 };
 
 /*
@@ -377,14 +387,21 @@
 	DBG("slot %d", ril->slot);
 }
 
+/*
+ * sim_state_watch listens to SIM state changes and creates/removes atoms
+ * accordingly. This is needed because we cannot rely on the modem core code,
+ * which handles modem state transitions, to do this due to the SIM not being
+ * accessible in the offline state for mtk modems. This causes a mismatch
+ * between what the core thinks it can do in some states and what the mtk modem
+ * can really do in those. This is a workaround to solve that.
+ */
 static void sim_state_watch(enum ofono_sim_state new_state, void *data)
 {
+	struct ofono_modem *modem = data;
+	struct mtk_data *ril = ofono_modem_get_data(modem);
+
 	if (new_state == OFONO_SIM_STATE_READY) {
-		struct ofono_modem *modem = data;
-		struct mtk_data *ril = ofono_modem_get_data(modem);
-		struct ofono_gprs *gprs;
 		struct ofono_gprs_context *gc;
-		struct ofono_message_waiting *mw;
 		struct mtk_gprs_data gprs_data = { ril->modem, modem };
 		struct ril_gprs_context_data inet_ctx =
 			{ ril->modem, OFONO_GPRS_CONTEXT_TYPE_INTERNET };
@@ -399,22 +416,26 @@
 		 *  - stk ( SIM toolkit )
 		 *  - radio_settings
 		 */
-		ofono_sms_create(modem, OFONO_RIL_VENDOR_MTK,
-					RILMODEM, ril->modem);
+		ril->sms = ofono_sms_create(modem, OFONO_RIL_VENDOR_MTK,
+						RILMODEM, ril->modem);
 
 		/* netreg needs access to the SIM (SPN, SPDI) */
-		ofono_netreg_create(modem, OFONO_RIL_VENDOR_MTK,
-					RILMODEM, ril->modem);
-		ofono_ussd_create(modem, OFONO_RIL_VENDOR_MTK,
-					RILMODEM, ril->modem);
-		ofono_call_settings_create(modem, OFONO_RIL_VENDOR_MTK,
-						RILMODEM, ril->modem);
-		ofono_call_forwarding_create(modem, OFONO_RIL_VENDOR_MTK,
-						RILMODEM, ril->modem);
-		ofono_call_barring_create(modem, OFONO_RIL_VENDOR_MTK,
-						RILMODEM, ril->modem);
+		ril->netreg = ofono_netreg_create(modem, OFONO_RIL_VENDOR_MTK,
+							RILMODEM, ril->modem);
+		ril->ussd = ofono_ussd_create(modem, OFONO_RIL_VENDOR_MTK,
+						RILMODEM, ril->modem);
+		ril->call_settings =
+			ofono_call_settings_create(modem, OFONO_RIL_VENDOR_MTK,
+							RILMODEM, ril->modem);
+		ril->call_forwarding =
+			ofono_call_forwarding_create(modem,
+							OFONO_RIL_VENDOR_MTK,
+							RILMODEM, ril->modem);
+		ril->call_barring =
+			ofono_call_barring_create(modem, OFONO_RIL_VENDOR_MTK,
+							RILMODEM, ril->modem);
 
-		gprs = ofono_gprs_create(modem, OFONO_RIL_VENDOR_MTK,
+		ril->gprs = ofono_gprs_create(modem, OFONO_RIL_VENDOR_MTK,
 						MTKMODEM, &gprs_data);
 
 		gc = ofono_gprs_context_create(modem, OFONO_RIL_VENDOR_MTK,
@@ -422,7 +443,7 @@
 		if (gc) {
 			ofono_gprs_context_set_type(gc,
 					OFONO_GPRS_CONTEXT_TYPE_INTERNET);
-			ofono_gprs_add_context(gprs, gc);
+			ofono_gprs_add_context(ril->gprs, gc);
 		}
 
 		gc = ofono_gprs_context_create(modem, OFONO_RIL_VENDOR_MTK,
@@ -430,12 +451,49 @@
 		if (gc) {
 			ofono_gprs_context_set_type(gc,
 					OFONO_GPRS_CONTEXT_TYPE_MMS);
-			ofono_gprs_add_context(gprs, gc);
-		}
-
-		mw = ofono_message_waiting_create(modem);
-		if (mw)
-			ofono_message_waiting_register(mw);
+			ofono_gprs_add_context(ril->gprs, gc);
+		}
+
+		ril->message_waiting = ofono_message_waiting_create(modem);
+		if (ril->message_waiting)
+			ofono_message_waiting_register(ril->message_waiting);
+
+	} else if (new_state == OFONO_SIM_STATE_LOCKED_OUT) {
+
+		DBG("SIM locked, removing atoms");
+
+		if (ril->message_waiting) {
+			ofono_message_waiting_remove(ril->message_waiting);
+			ril->message_waiting = NULL;
+		}
+		if (ril->gprs) {
+			ofono_gprs_remove(ril->gprs);
+			ril->gprs = NULL;
+		}
+		if (ril->call_barring) {
+			ofono_call_barring_remove(ril->call_barring);
+			ril->call_barring = NULL;
+		}
+		if (ril->call_forwarding) {
+			ofono_call_forwarding_remove(ril->call_forwarding);
+			ril->call_forwarding = NULL;
+		}
+		if (ril->call_settings) {
+			ofono_call_settings_remove(ril->call_settings);
+			ril->call_settings = NULL;
+		}
+		if (ril->ussd) {
+			ofono_ussd_remove(ril->ussd);
+			ril->ussd = NULL;
+		}
+		if (ril->netreg) {
+			ofono_netreg_remove(ril->netreg);
+			ril->netreg = NULL;
+		}
+		if (ril->sms) {
+			ofono_sms_remove(ril->sms);
+			ril->sms = NULL;
+		}
 	}
 }
 
@@ -453,12 +511,6 @@
 					RILMODEM, &ril->sim_data);
 	g_assert(ril->sim != NULL);
 
-	/* Create interfaces useful for emergency calls */
-	ofono_voicecall_create(modem, OFONO_RIL_VENDOR_MTK,
-					MTKMODEM, ril->modem);
-	ofono_call_volume_create(modem, OFONO_RIL_VENDOR_MTK,
-					RILMODEM, ril->modem);
-
 	/* Radio settings does not depend on the SIM */
 	ofono_radio_settings_create(modem, OFONO_RIL_VENDOR_MTK,
 					MTKMODEM, ril->modem);
@@ -658,6 +710,32 @@
 	}
 }
 
+static void create_atoms_on_connection(struct ofono_modem *modem)
+{
+	struct mtk_data *ril = ofono_modem_get_data(modem);
+
+	ril->devinfo = ofono_devinfo_create(modem, OFONO_RIL_VENDOR_MTK,
+						RILMODEM, ril->modem);
+
+	/* Create interfaces useful for emergency calls */
+	ril->voicecall = ofono_voicecall_create(modem, OFONO_RIL_VENDOR_MTK,
+						MTKMODEM, ril->modem);
+	ril->callvolume = ofono_call_volume_create(modem, OFONO_RIL_VENDOR_MTK,
+							RILMODEM, ril->modem);
+}
+
+static void remove_atoms_on_disconnection(struct ofono_modem *modem)
+{
+	struct mtk_data *ril = ofono_modem_get_data(modem);
+
+	ofono_call_volume_remove(ril->callvolume);
+	ril->callvolume = NULL;
+	ofono_voicecall_remove(ril->voicecall);
+	ril->voicecall = NULL;
+	ofono_devinfo_remove(ril->devinfo);
+	ril->devinfo = NULL;
+}
+
 static gboolean mtk_connected(gpointer user_data)
 {
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
@@ -669,8 +747,7 @@
 
 	ofono_modem_set_powered(modem, TRUE);
 
-	ril->devinfo = ofono_devinfo_create(modem, OFONO_RIL_VENDOR_MTK,
-						RILMODEM, ril->modem);
+	create_atoms_on_connection(modem);
 
 	/* Call the function just once */
 	return FALSE;
@@ -686,8 +763,7 @@
 	if (create_gril(modem) < 0)
 		return TRUE;
 
-	ril->devinfo = ofono_devinfo_create(modem, OFONO_RIL_VENDOR_MTK,
-						RILMODEM, ril->modem);
+	create_atoms_on_connection(modem);
 
 	if (ril->pending_cb)
 		ril->pending_cb(ril->pending_cbd);
@@ -705,8 +781,8 @@
 
 	DBG("slot %d", ril->slot);
 
-	/* Uses old gril object, remove and recreate later */
-	ofono_devinfo_remove(ril->devinfo);
+	/* Atoms use old gril object, remove and recreate later */
+	remove_atoms_on_disconnection(modem);
 
 	g_ril_unref(ril->modem);
 	ril->modem = NULL;
@@ -804,6 +880,9 @@
 		g_timeout_add_seconds(RILD_CONNECT_RETRY_TIME_S,
 					connect_rild, modem);
 
+	/* We handle SIM states due to MTK peculiarities */
+	ofono_modem_set_driver_watches_sim(modem, TRUE);
+
 	/*
 	 * We will mark the modem as powered when we receive an event that
 	 * confirms that the radio is in a state different from unavailable

=== modified file 'plugins/ril.c'
--- plugins/ril.c	2014-08-19 16:29:51 +0000
+++ plugins/ril.c	2014-09-26 14:35:25 +0000
@@ -80,7 +80,7 @@
 	ofono_bool_t ofono_online;
 	int radio_state;
 	struct ofono_sim *sim;
-	struct ofono_voicecall *voice;
+	struct ofono_radio_settings *radio_settings;
 	int rild_connect_retries;
 };
 
@@ -121,17 +121,11 @@
 		switch (radio_state) {
 		case RADIO_STATE_ON:
 
-			if (ril->voice == NULL) {
-				ril->voice =
-					ofono_voicecall_create(modem,
-								ril->vendor,
-								RILMODEM,
-								ril->modem);
-				ofono_call_volume_create(modem, ril->vendor,
-							RILMODEM, ril->modem);
-				ofono_radio_settings_create(modem, ril->vendor,
-							RILMODEM, ril->modem);
-			}
+			if (ril->radio_settings == NULL)
+				ril->radio_settings =
+					ofono_radio_settings_create(modem,
+						ril->vendor, RILMODEM,
+						ril->modem);
 
 			send_get_sim_status(modem);
 			break;
@@ -257,6 +251,8 @@
 	DBG("");
 
 	ofono_devinfo_create(modem, ril->vendor, RILMODEM, ril->modem);
+	ofono_voicecall_create(modem, ril->vendor, RILMODEM, ril->modem);
+	ofono_call_volume_create(modem, ril->vendor, RILMODEM, ril->modem);
 
 	sim_data.gril = ril->modem;
 	sim_data.modem = modem;

=== modified file 'plugins/ubuntu-apndb.c'
--- plugins/ubuntu-apndb.c	2014-07-29 06:35:48 +0000
+++ plugins/ubuntu-apndb.c	2014-09-26 14:35:25 +0000
@@ -400,7 +400,7 @@
 	type = determine_apn_type(types);
 
 	if (type == OFONO_GPRS_CONTEXT_TYPE_ANY ||
-		(type == OFONO_GPRS_CONTEXT_TYPE_MMS && mmsproxy == NULL)) {
+		(type == OFONO_GPRS_CONTEXT_TYPE_MMS && mmscenter == NULL)) {
 		DBG("Skipping %s context; types: %s", apn, types);
 		return;
 	}

=== modified file 'src/modem.c'
--- src/modem.c	2014-03-13 16:33:34 +0000
+++ src/modem.c	2014-09-26 14:35:25 +0000
@@ -87,6 +87,7 @@
 	void			*driver_data;
 	char			*driver_type;
 	char			*name;
+	ofono_bool_t		driver_watches_sim;
 };
 
 struct ofono_devinfo {
@@ -697,7 +698,8 @@
 	case OFONO_SIM_STATE_RESETTING:
 		break;
 	case OFONO_SIM_STATE_LOCKED_OUT:
-		modem_change_state(modem, MODEM_STATE_PRE_SIM);
+		if (modem->driver_watches_sim == FALSE)
+			modem_change_state(modem, MODEM_STATE_PRE_SIM);
 		break;
 	case OFONO_SIM_STATE_READY:
 		/* Avoid state regressions */
@@ -1803,6 +1805,17 @@
 	modem->driver_type = g_strdup(type);
 }
 
+void ofono_modem_set_driver_watches_sim(struct ofono_modem *modem,
+					ofono_bool_t value)
+{
+	modem->driver_watches_sim = value;
+}
+
+ofono_bool_t ofono_modem_get_driver_watches_sim(struct ofono_modem *modem)
+{
+	return modem->driver_watches_sim;
+}
+
 struct ofono_modem *ofono_modem_create(const char *name, const char *type)
 {
 	struct ofono_modem *modem;

=== modified file 'src/sim.c'
--- src/sim.c	2013-11-11 10:37:02 +0000
+++ src/sim.c	2014-09-26 14:35:25 +0000
@@ -2727,7 +2727,7 @@
 
 	DBG("%p", sim);
 
-	if (sim == NULL)
+	if (sim == NULL || sim->spn_watches == NULL)
 		return FALSE;
 
 	ret = __ofono_watchlist_remove_item(sim->spn_watches, *id);

=== modified file 'unit/test-grilreply.c'
--- unit/test-grilreply.c	2014-07-16 22:55:36 +0000
+++ unit/test-grilreply.c	2014-09-26 14:35:25 +0000
@@ -829,6 +829,36 @@
 	}
 };
 
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * {13,(null),(null),UNKNOWN,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel12[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x33, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x62, 0x00, 0x65, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_12 = {
+	.status = NETWORK_REGISTRATION_STATUS_DENIED,
+	.tech = RADIO_TECH_UNKNOWN,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel12,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel12),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
 static const struct ril_msg reply_operator_invalid_1 = {
 	.buf = "",
 	.buf_len = 0,
@@ -1866,6 +1896,11 @@
 				test_reply_reg_state_valid);
 
 	g_test_add_data_func("/testgrilreply/netreg: "
+				"valid VOICE_REG_STATE Test 12",
+				&voice_reg_valid_12,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
 				"invalid GET_OPERATOR Test 1",
 				&reply_operator_invalid_1,
 				test_reply_operator_invalid);