Merge lp:~phablet-team/ofono/arale-enablement into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

  [ Tony Espy ]
  * test/rilmodem/sim: add new SIM test scripts
  * test: fix test-call-forwarding script (LP: #1396323)

  [ Vicamo Yang ]
  * mtkmodem, rilmodem: re-factor naming
    This change makes the naming of GRil, mtk_data,
    ofono_modem, and ril_data instances consistent.
  * rilmodem: fix duplicate APPSTATE* constants
  * gril: get rid of duplicate ringbuffer.h (LP: #1408250)
  * mtk.c: use RIL_RADIO_POWER request for single slot modems

  [ Alfonso Sanchez-Beato ]
  * gril, unit, mtk.c: SIM mode and session ID fixes for arale
    For MTK modems, DUAL_SIM_MODE requests aren't necessary. Also
    add session-id to SIM IO requests for newer MTK modems.
  * rilmodem, mtk.c, ril.c: add auto-answer support
    This change adds auto-answer support which is triggered
    by usage of a special test SIM (MCC/MNC 001/01 or 001/001).
  * mtkmodem, unit, mtk.c: support arale firmware switch
    This change will cause the correct modem firmware to
    be loaded based upon the SIM MCC abd MNC. If new
    firmware is loaded, a modem reset is triggered.
  * mtkmodem, unit, mtk.c: handle suspend events
    RIL_RESUME_REGISTRATION requests are not sent to
    MTK modems if suspend events are received.
  * gril, include, mbpi, rilmodem, mtkmodem, rilmodem,
    gprs, unit, modem, ril.c, mtk.c: LTE updates
    This changes detection logic for LTE modems to rilmodem
    ( via an environment var ) and mtkmodem ( via a modem
    query ). If detected, a RIL_INITIAL_ATTACH_APN request
    is not sent to the modem during gprs initialization.

This merge includes multiple changes necessry for the enablement of arale. As such, most of the changes affect arale or krillin, however some bug fixes and test scripts are also included.

Changes include:

1. New rilmodem SIM test scripts added
2. Re-factoring of mtkmodem/rilmodem to making variable naming consistent
3. Use std RADIO_POWER request for MTK single slot modems
4. DUAL_SIM_MODE requests aren't necessary for MTK single slot modems
5. Auto-answer support added when special TEST SIMs are detected
6. Support dynamic arale modem firmware switching
7. Send RESUME_REGISTRATION requests to MTK modems when suspend events are received
8. Detect LTE modem capability, and send an INITIAL_ATTACH_APN request during GPRS initialization ( applies to mtkmodem and standard rilmodem )

[lp:~phablet-team/ofono/arale-enablement]

6886. By Tony Espy on 2015-02-04

* test/rilmodem/sim: add new SIM test scripts
* test: fix test-call-forwarding script (LP: #1396323)
* mtkmodem, rilmodem: re-factor naming
  This change makes the naming of GRil, mtk_data,
  ofono_modem, and ril_data instances consistent.
* rilmodem: fix duplicate APPSTATE* constants
* gril: get rid of duplicate ringbuffer.h (LP: #1408250)
* mtk.c: use RIL_RADIO_POWER request for single slot modems
* gril, unit, mtk.c: SIM mode and session ID fixes for arale
  For MTK modems, DUAL_SIM_MODE requests aren't necessary. Also
  add session-id to SIM IO requests for newer MTK modems.
* rilmodem, mtk.c, ril.c: add auto-answer support
  This change adds auto-answer support which is triggered
  by usage of a special test SIM (MCC/MNC 001/01 or 001/001).
* mtkmodem, unit, mtk.c: support arale firmware switch
  This change will cause the correct modem firmware to
  be loaded based upon the SIM MCC and MNC. If new
  firmware is loaded, a modem reset is triggered.
* mtkmodem, unit, mtk.c: handle suspend events
  RIL_RESUME_REGISTRATION requests are not sent to
  MTK modems if suspend events are received.
* gril, include, mbpi, rilmodem, mtkmodem, rilmodem,
  gprs, unit, modem, ril.c, mtk.c: LTE updates
  This changes detection logic for LTE modems to rilmodem
  ( via an environment var ) and mtkmodem ( via a modem
  query ). If detected, a RIL_INITIAL_ATTACH_APN request
  is not sent to the modem during gprs initialization.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Tony Espy (awe)]

Here's my test results:

1. mako/vivid/#90 ( checked voice in/out, sms in/out, gprs, flight-mode, pin-unlock ) - OK

2. krillin/vivid/#99 ( checked the same areas )
  - NM delay starting mobile data when FM disabled ( known bug )
  - the message-indicator does go green when a new SMS received

3. arale/vivid/#90 ( checked the same areas )
  - sending SMS from message-indicator seems broken
  - atfer enabling FM, indicator shows 'airplane' + 'HSPA' icons together!
  - couldn't disable FM from the UI; cmd-line works

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Re: FM in arale, with latest alpha release (vivid 97) I was able to use FM from the GUI.

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-15 16:26:34 +0000
+++ debian/changelog	2015-02-04 00:09:49 +0000
@@ -1,3 +1,40 @@
+ofono (1.12.bzr6886+15.04.20150203-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Tony Espy ]
+  * test/rilmodem/sim: add new SIM test scripts
+  * test: fix test-call-forwarding script (LP: #1396323)
+
+  [ Vicamo Yang ]
+  * mtkmodem, rilmodem: re-factor naming
+    This change makes the naming of GRil, mtk_data,
+    ofono_modem, and ril_data instances consistent.
+  * rilmodem: fix duplicate APPSTATE* constants
+  * gril: get rid of duplicate ringbuffer.h (LP: #1408250)
+  * mtk.c: use RIL_RADIO_POWER request for single slot modems
+
+  [ Alfonso Sanchez-Beato ]
+  * gril, unit, mtk.c: SIM mode and session ID fixes for arale
+    For MTK modems, DUAL_SIM_MODE requests aren't necessary.  Also
+    add session-id to SIM IO requests for newer MTK modems.
+  * rilmodem, mtk.c, ril.c: add auto-answer support
+    This change adds auto-answer support which is triggered
+    by usage of a special test SIM (MCC/MNC 001/01 or 001/001).
+  * mtkmodem, unit, mtk.c: support arale firmware switch
+    This change will cause the correct modem firmware to
+    be loaded based upon the SIM MCC and MNC.  If new
+    firmware is loaded, a modem reset is triggered.
+  * mtkmodem, unit, mtk.c: handle suspend events
+    RIL_RESUME_REGISTRATION requests are not sent to
+    MTK modems if suspend events are received.
+  * gril, include, mbpi, rilmodem, mtkmodem, rilmodem,
+    gprs, unit, modem, ril.c, mtk.c: LTE updates
+    This changes detection logic for LTE modems to rilmodem
+    ( via an environment var ) and mtkmodem ( via a modem
+    query ).  If detected, a RIL_INITIAL_ATTACH_APN request
+    is not sent to the modem during gprs initialization.
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 03 Feb 2015 18:17:48 -0500
+
 ofono (1.12.bzr6882+15.04.20150115-0ubuntu1) vivid; urgency=low
 
   [ Martin Pitt ]

=== modified file 'drivers/mtkmodem/gprs.c'
--- drivers/mtkmodem/gprs.c	2014-07-31 06:45:32 +0000
+++ drivers/mtkmodem/gprs.c	2015-02-04 00:09:49 +0000
@@ -138,17 +138,14 @@
 static int mtk_gprs_probe(struct ofono_gprs *gprs,
 				unsigned int vendor, void *data)
 {
-	struct mtk_gprs_data *gprs_data = data;
-	GRil *ril = gprs_data->gril;
+	struct ril_gprs_driver_data *driver_data = data;
 	struct ril_gprs_data *gd;
 
 	gd = g_try_new0(struct ril_gprs_data, 1);
 	if (gd == NULL)
 		return -ENOMEM;
 
-	ril_gprs_start(ril, gprs, gd);
-
-	gd->modem = gprs_data->modem;
+	ril_gprs_start(driver_data, gprs, gd);
 
 	/*
 	 * In MTK the event emitted when the gprs state changes is different
@@ -178,6 +175,7 @@
 	.remove			= mtk_gprs_remove,
 	.set_attached		= mtk_gprs_set_attached,
 	.attached_status	= ril_gprs_registration_status,
+	.set_ia_apn		= ril_gprs_set_ia_apn,
 };
 
 void mtk_gprs_init(void)

=== modified file 'drivers/mtkmodem/mtk_constants.h'
--- drivers/mtkmodem/mtk_constants.h	2014-11-03 17:50:24 +0000
+++ drivers/mtkmodem/mtk_constants.h	2015-02-04 00:09:49 +0000
@@ -31,7 +31,11 @@
 #define MTK_RIL_REQUEST_SET_CALL_INDICATION 2036
 #define MTK_RIL_REQUEST_GET_3G_CAPABILITY 2038
 #define MTK_RIL_REQUEST_SET_3G_CAPABILITY 2039
+#define MTK_RIL_REQUEST_SET_TRM 2053
 #define MTK_RIL_REQUEST_SET_FD_MODE 2073
+#define MTK_RIL_REQUEST_RESUME_REGISTRATION 2077
+#define MTK_RIL_REQUEST_STORE_MODEM_TYPE 2078
+#define MTK_RIL_REQUEST_QUERY_MODEM_TYPE 2079
 
 /* RIL Unsolicited Messages */
 #define MTK_RIL_UNSOL_MTK_BASE 3000

=== modified file 'drivers/mtkmodem/mtkreply.c'
--- drivers/mtkmodem/mtkreply.c	2014-11-03 17:50:24 +0000
+++ drivers/mtkmodem/mtkreply.c	2015-02-04 00:09:49 +0000
@@ -65,3 +65,34 @@
 error:
 	return -1;
 }
+
+int g_mtk_reply_parse_query_modem_type(GRil *gril,
+					const struct ril_msg *message)
+{
+	struct parcel rilp;
+	int numint, type;
+
+	g_ril_init_parcel(message, &rilp);
+
+	numint = parcel_r_int32(&rilp);
+	if (numint != 1) {
+		ofono_error("%s Wrong format", __func__);
+		goto error;
+	}
+
+	type = parcel_r_int32(&rilp);
+
+	if (rilp.malformed) {
+		ofono_error("%s: malformed parcel", __func__);
+		goto error;
+	}
+
+	g_ril_append_print_buf(gril, "{%d}", type);
+	g_ril_print_response(gril, message);
+
+	return type;
+
+error:
+	return -1;
+
+}

=== modified file 'drivers/mtkmodem/mtkreply.h'
--- drivers/mtkmodem/mtkreply.h	2014-07-24 08:31:18 +0000
+++ drivers/mtkmodem/mtkreply.h	2015-02-04 00:09:49 +0000
@@ -33,6 +33,9 @@
 int g_mtk_reply_parse_get_3g_capability(GRil *gril,
 					const struct ril_msg *message);
 
+int g_mtk_reply_parse_query_modem_type(GRil *gril,
+					const struct ril_msg *message);
+					
 #ifdef __cplusplus
 }
 #endif

=== modified file 'drivers/mtkmodem/mtkrequest.c'
--- drivers/mtkmodem/mtkrequest.c	2014-11-03 17:50:24 +0000
+++ drivers/mtkmodem/mtkrequest.c	2015-02-04 00:09:49 +0000
@@ -133,3 +133,31 @@
 
 	g_ril_append_print_buf(gril, "(%d)", mode);
 }
+
+void g_mtk_request_store_modem_type(GRil *gril, int mode, struct parcel *rilp)
+{
+	parcel_init(rilp);
+	parcel_w_int32(rilp, 1);
+	parcel_w_int32(rilp, mode);
+
+	g_ril_append_print_buf(gril, "(%d)", mode);
+}
+
+void g_mtk_request_set_trm(GRil *gril, int trm, struct parcel *rilp)
+{
+	parcel_init(rilp);
+	parcel_w_int32(rilp, 1);
+	parcel_w_int32(rilp, trm);
+
+	g_ril_append_print_buf(gril, "(%d)", trm);
+}
+
+void g_mtk_request_resume_registration(GRil *gril, int session_id,
+					struct parcel *rilp)
+{
+	parcel_init(rilp);
+	parcel_w_int32(rilp, 1);
+	parcel_w_int32(rilp, session_id);
+
+	g_ril_append_print_buf(gril, "(%d)", session_id);
+}

=== modified file 'drivers/mtkmodem/mtkrequest.h'
--- drivers/mtkmodem/mtkrequest.h	2014-11-03 17:50:24 +0000
+++ drivers/mtkmodem/mtkrequest.h	2015-02-04 00:09:49 +0000
@@ -52,6 +52,18 @@
 #define MTK_FD_PAR1_SCREEN_OFF 0
 #define MTK_FD_PAR1_SCREEN_ON 1
 
+#define MTK_MD_TYPE_INVALID 0
+#define MTK_MD_TYPE_2G 1
+#define MTK_MD_TYPE_3G 2
+#define MTK_MD_TYPE_WG 3
+#define MTK_MD_TYPE_TG 4
+/* FDD CSFB modem */
+#define MTK_MD_TYPE_LWG 5
+/* TDD CSFB modem */
+#define MTK_MD_TYPE_LTG 6
+/* SGLTE modem */
+#define MTK_MD_TYPE_LTNG 7
+
 /*
  * The meaning of mode seems to be:
  * -1 -> Both SIMs inactive
@@ -108,6 +120,22 @@
  */
 void g_mtk_request_set_3g_capability(GRil *gril, struct parcel *rilp);
 
+/*
+ * Set the MTK modem mode. See MTK_MD_TYPE_*.
+ */
+void g_mtk_request_store_modem_type(GRil *gril, int mode, struct parcel *rilp);
+
+/*
+ * Set TRM
+ */
+void g_mtk_request_set_trm(GRil *gril, int trm, struct parcel *rilp);
+
+/*
+ * Request to resume registration.
+ */
+void g_mtk_request_resume_registration(GRil *gril, int session_id,
+					struct parcel *rilp);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'drivers/mtkmodem/mtkunsol.c'
--- drivers/mtkmodem/mtkunsol.c	2014-03-20 07:46:16 +0000
+++ drivers/mtkmodem/mtkunsol.c	2015-02-04 00:09:49 +0000
@@ -131,3 +131,34 @@
 
 	return NULL;
 }
+
+int g_mtk_unsol_parse_registration_suspended(GRil *gril,
+						const struct ril_msg *message)
+{
+	struct parcel rilp;
+	int numint, session_id;
+
+	g_ril_init_parcel(message, &rilp);
+
+	numint = parcel_r_int32(&rilp);
+	if (numint != 1) {
+		ofono_error("%s Wrong format", __func__);
+		goto error;
+	}
+
+	session_id = parcel_r_int32(&rilp);
+
+	if (rilp.malformed) {
+		ofono_error("%s: malformed parcel", __func__);
+		goto error;
+	}
+
+	g_ril_append_print_buf(gril, "{%d}", session_id);
+	g_ril_print_unsol(gril, message);
+
+	return session_id;
+
+error:
+	return -1;
+
+}

=== modified file 'drivers/mtkmodem/mtkunsol.h'
--- drivers/mtkmodem/mtkunsol.h	2014-03-20 07:46:16 +0000
+++ drivers/mtkmodem/mtkunsol.h	2015-02-04 00:09:49 +0000
@@ -41,6 +41,10 @@
 struct unsol_call_indication *g_mtk_unsol_parse_incoming_call_indication(
 					GRil *gril, struct ril_msg *message);
 
+/* Returns a session id that must be used in resume registration request */
+int g_mtk_unsol_parse_registration_suspended(GRil *gril,
+						const struct ril_msg *message);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'drivers/mtkmodem/mtkutil.c'
--- drivers/mtkmodem/mtkutil.c	2014-11-03 17:50:24 +0000
+++ drivers/mtkmodem/mtkutil.c	2015-02-04 00:09:49 +0000
@@ -43,8 +43,16 @@
 		return "MTK_RIL_REQUEST_GET_3G_CAPABILITY";
 	case MTK_RIL_REQUEST_SET_3G_CAPABILITY:
 		return "MTK_RIL_REQUEST_SET_3G_CAPABILITY";
+	case MTK_RIL_REQUEST_SET_TRM:
+		return "MTK_RIL_REQUEST_SET_TRM";
 	case MTK_RIL_REQUEST_SET_FD_MODE:
 		return "MTK_RIL_REQUEST_SET_FD_MODE";
+	case MTK_RIL_REQUEST_STORE_MODEM_TYPE:
+		return "MTK_RIL_REQUEST_STORE_MODEM_TYPE";
+	case MTK_RIL_REQUEST_RESUME_REGISTRATION:
+		return "MTK_RIL_REQUEST_RESUME_REGISTRATION";
+	case MTK_RIL_REQUEST_QUERY_MODEM_TYPE:
+		return "MTK_RIL_REQUEST_QUERY_MODEM_TYPE";
 	default:
 		return NULL;
 	}

=== modified file 'drivers/mtkmodem/mtkutil.h'
--- drivers/mtkmodem/mtkutil.h	2014-11-17 15:43:35 +0000
+++ drivers/mtkmodem/mtkutil.h	2015-02-04 00:09:49 +0000
@@ -36,11 +36,6 @@
 
 void mtk_reset_all_modems(void);
 
-struct mtk_gprs_data {
-	GRil *gril;
-	struct ofono_modem *modem;
-};
-
 const char *mtk_request_id_to_string(int req);
 const char *mtk_unsol_request_to_string(int req);
 

=== modified file 'drivers/mtkmodem/radio-settings.c'
--- drivers/mtkmodem/radio-settings.c	2014-11-05 10:51:01 +0000
+++ drivers/mtkmodem/radio-settings.c	2015-02-04 00:09:49 +0000
@@ -108,7 +108,7 @@
 static int mtk_radio_settings_probe(struct ofono_radio_settings *rs,
 					unsigned int vendor, void *user)
 {
-	GRil *ril = user;
+	struct ril_radio_settings_driver_data* rs_init_data = user;
 	struct radio_data *rsd = g_try_new0(struct radio_data, 1);
 
 	if (rsd == NULL) {
@@ -116,7 +116,8 @@
 		return -ENOMEM;
 	}
 
-	rsd->ril = g_ril_clone(ril);
+	rsd->ril = g_ril_clone(rs_init_data->gril);
+	rsd->modem = rs_init_data->modem;
 
 	ofono_radio_settings_set_data(rs, rsd);
 
@@ -155,7 +156,7 @@
 	if (is_3g) {
 		modem_rats[OFONO_RADIO_ACCESS_MODE_UMTS] = TRUE;
 
-		if (getenv("OFONO_RIL_RAT_LTE"))
+		if (ofono_modem_get_boolean(rd->modem, MODEM_PROP_LTE_CAPABLE))
 			modem_rats[OFONO_RADIO_ACCESS_MODE_LTE] = TRUE;
 	}
 

=== modified file 'drivers/mtkmodem/voicecall.c'
--- drivers/mtkmodem/voicecall.c	2014-07-28 07:12:26 +0000
+++ drivers/mtkmodem/voicecall.c	2015-02-04 00:09:49 +0000
@@ -42,6 +42,7 @@
 
 #include "common.h"
 #include "mtkmodem.h"
+#include "drivers/rilmodem/rilutil.h"
 #include "drivers/rilmodem/voicecall.h"
 
 /*
@@ -111,14 +112,14 @@
 static int mtk_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
 				void *data)
 {
-	GRil *ril = data;
+	struct ril_voicecall_driver_data *driver_data = data;
 	struct ril_voicecall_data *vd;
 
 	vd = g_try_new0(struct ril_voicecall_data, 1);
 	if (vd == NULL)
 		return -ENOMEM;
 
-	ril_voicecall_start(ril, vc, vendor, vd);
+	ril_voicecall_start(driver_data, vc, vendor, vd);
 
 	/*
 	 * Register events after ofono_voicecall_register() is called from

=== modified file 'drivers/rilmodem/gprs.c'
--- drivers/rilmodem/gprs.c	2014-11-20 00:03:31 +0000
+++ drivers/rilmodem/gprs.c	2015-02-04 00:09:49 +0000
@@ -100,6 +100,53 @@
 	}
 }
 
+static void set_ia_apn_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_gprs_cb_t cb = cbd->cb;
+	struct ofono_gprs *gprs = cbd->user;
+	struct ril_gprs_data *gd = ofono_gprs_get_data(gprs);
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: reply failure: %s", __func__,
+				ril_error_to_string(message->error));
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+		return;
+	}
+
+	g_ril_print_response_no_args(gd->ril, message);
+
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+void ril_gprs_set_ia_apn(struct ofono_gprs *gprs, const char *apn,
+				enum ofono_gprs_proto proto, const char *user,
+				const char *passwd, const char *mccmnc,
+				ofono_gprs_cb_t cb, void *data)
+{
+	struct ril_gprs_data *gd = ofono_gprs_get_data(gprs);
+	struct cb_data *cbd;
+	struct parcel rilp;
+
+	if (!ofono_modem_get_boolean(gd->modem, MODEM_PROP_LTE_CAPABLE)) {
+		CALLBACK_WITH_SUCCESS(cb, data);
+		return;
+	}
+
+	cbd = cb_data_new(cb, data, gprs);
+
+	g_ril_request_set_initial_attach_apn(gd->ril, apn, proto, user, passwd,
+						mccmnc, &rilp);
+
+	if (g_ril_send(gd->ril, RIL_REQUEST_SET_INITIAL_ATTACH_APN,
+			&rilp, set_ia_apn_cb, cbd, g_free) == 0) {
+		ofono_error("%s: failure sending request", __func__);
+
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, data);
+	}
+}
+
 static void ril_gprs_state_change(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;
@@ -421,10 +468,11 @@
 		ofono_error("%s: send failed", __func__);
 }
 
-void ril_gprs_start(GRil *ril, struct ofono_gprs *gprs,
-			struct ril_gprs_data *gd)
+void ril_gprs_start(struct ril_gprs_driver_data *driver_data,
+			struct ofono_gprs *gprs, struct ril_gprs_data *gd)
 {
-	gd->ril = g_ril_clone(ril);
+	gd->ril = g_ril_clone(driver_data->gril);
+	gd->modem = driver_data->modem;
 	gd->ofono_attached = FALSE;
 	gd->max_cids = 0;
 	gd->rild_status = -1;
@@ -440,14 +488,14 @@
 
 int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *data)
 {
-	GRil *ril = data;
+	struct ril_gprs_driver_data *driver_data = data;
 	struct ril_gprs_data *gd;
 
 	gd = g_try_new0(struct ril_gprs_data, 1);
 	if (gd == NULL)
 		return -ENOMEM;
 
-	ril_gprs_start(ril, gprs, gd);
+	ril_gprs_start(driver_data, gprs, gd);
 
 	return 0;
 }
@@ -473,6 +521,7 @@
 	.remove			= ril_gprs_remove,
 	.set_attached		= ril_gprs_set_attached,
 	.attached_status	= ril_gprs_registration_status,
+	.set_ia_apn		= ril_gprs_set_ia_apn,
 };
 
 void ril_gprs_init(void)

=== modified file 'drivers/rilmodem/gprs.h'
--- drivers/rilmodem/gprs.h	2014-09-26 08:45:20 +0000
+++ drivers/rilmodem/gprs.h	2015-02-04 00:09:49 +0000
@@ -19,6 +19,8 @@
  *
  */
 
+#include "drivers/rilmodem/rilutil.h"
+
 struct ril_gprs_data {
 	GRil *ril;
 	struct ofono_modem *modem;
@@ -33,8 +35,12 @@
 
 int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *data);
 void ril_gprs_remove(struct ofono_gprs *gprs);
-void ril_gprs_start(GRil *ril, struct ofono_gprs *gprs,
-			struct ril_gprs_data *gd);
+void ril_gprs_start(struct ril_gprs_driver_data *driver_data,
+			struct ofono_gprs *gprs, struct ril_gprs_data *gd);
 gboolean ril_gprs_set_attached_cb(gpointer user_data);
 void ril_gprs_registration_status(struct ofono_gprs *gprs,
 					ofono_gprs_status_cb_t cb, void *data);
+void ril_gprs_set_ia_apn(struct ofono_gprs *gprs, const char *apn,
+				enum ofono_gprs_proto proto, const char *user,
+				const char *passwd, const char *mccmnc,
+				ofono_gprs_cb_t cb, void *data);

=== modified file 'drivers/rilmodem/radio-settings.c'
--- drivers/rilmodem/radio-settings.c	2014-11-17 15:43:35 +0000
+++ drivers/rilmodem/radio-settings.c	2015-02-04 00:09:49 +0000
@@ -213,11 +213,13 @@
 	ofono_bool_t modem_rats[OFONO_RADIO_ACCESS_MODE_LAST] = { FALSE };
 	struct cb_data *cbd = user_data;
 	ofono_radio_settings_modem_rats_query_cb_t cb = cbd->cb;
+	struct ofono_radio_settings *rs = cbd->user;
+	struct radio_data *rd = ofono_radio_settings_get_data(rs);
 
 	modem_rats[OFONO_RADIO_ACCESS_MODE_GSM] = TRUE;
 	modem_rats[OFONO_RADIO_ACCESS_MODE_UMTS] = TRUE;
 
-	if (getenv("OFONO_RIL_RAT_LTE"))
+	if (ofono_modem_get_boolean(rd->modem, MODEM_PROP_LTE_CAPABLE))
 		modem_rats[OFONO_RADIO_ACCESS_MODE_LTE] = TRUE;
 
 	CALLBACK_WITH_SUCCESS(cb, modem_rats, cbd->data);
@@ -249,7 +251,7 @@
 static int ril_radio_settings_probe(struct ofono_radio_settings *rs,
 					unsigned int vendor, void *user)
 {
-	GRil *ril = user;
+	struct ril_radio_settings_driver_data* rs_init_data = user;
 	struct radio_data *rsd = g_try_new0(struct radio_data, 1);
 
 	if (rsd == NULL) {
@@ -257,7 +259,8 @@
 		return -ENOMEM;
 	}
 
-	rsd->ril = g_ril_clone(ril);
+	rsd->ril = g_ril_clone(rs_init_data->gril);
+	rsd->modem = rs_init_data->modem;
 
 	ofono_radio_settings_set_data(rs, rsd);
 

=== modified file 'drivers/rilmodem/radio-settings.h'
--- drivers/rilmodem/radio-settings.h	2014-06-12 10:47:10 +0000
+++ drivers/rilmodem/radio-settings.h	2015-02-04 00:09:49 +0000
@@ -21,6 +21,7 @@
 
 struct radio_data {
 	GRil *ril;
+	struct ofono_modem *modem;
 	gboolean fast_dormancy;
 	gboolean pending_fd;
 };

=== modified file 'drivers/rilmodem/rilutil.h'
--- drivers/rilmodem/rilutil.h	2014-07-29 06:11:22 +0000
+++ drivers/rilmodem/rilutil.h	2015-02-04 00:09:49 +0000
@@ -36,6 +36,8 @@
 #define PREFIX_25_NETMASK "255.255.255.128"
 #define PREFIX_24_NETMASK "255.255.255.0"
 
+#define MODEM_PROP_LTE_CAPABLE "lte-capable"
+
 enum ril_util_sms_store {
 	RIL_UTIL_SMS_STORE_SM =	0,
 	RIL_UTIL_SMS_STORE_ME =	1,
@@ -65,29 +67,6 @@
 	RIL_UTIL_CHARSET_8859_H =	0x10000,
 };
 
-/* TODO: consider moving these to ril_constants.h */
-enum app_state {
-	APPSTATE_UNKNOWN,
-	APPSTATE_DETECTED,
-	APPSTATE_PIN,
-	APPSTATE_PUK,
-	APPSTATE_SUBSCRIPTION_PERSO,
-	APPSTATE_READY,
-};
-
-enum perso_state {
-	PERSOSUBSTATE_SIM_NETWORK = 3,
-	PERSOSUBSTATE_SIM_NETWORK_SUBSET,
-	PERSOSUBSTATE_SIM_CORPORATE,
-	PERSOSUBSTATE_SIM_SERVICE_PROVIDER,
-	PERSOSUBSTATE_SIM_SIM,
-	PERSOSUBSTATE_SIM_NETWORK_PUK,
-	PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK,
-	PERSOSUBSTATE_SIM_CORPORATE_PUK,
-	PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK,
-	PERSOSUBSTATE_SIM_SIM_PUK,
-};
-
 struct ril_sim_data {
 	struct ofono_modem *modem;
 	GRil *gril;
@@ -99,6 +78,21 @@
 	enum ofono_gprs_context_type type;
 };
 
+struct ril_voicecall_driver_data {
+	GRil *gril;
+	struct ofono_modem *modem;
+};
+
+struct ril_gprs_driver_data {
+	GRil *gril;
+	struct ofono_modem *modem;
+};
+
+struct ril_radio_settings_driver_data {
+	GRil *gril;
+	struct ofono_modem *modem;
+};
+
 typedef void (*ril_util_sim_inserted_cb_t)(gboolean present, void *userdata);
 
 void decode_ril_error(struct ofono_error *error, const char *final);

=== modified file 'drivers/rilmodem/sim.c'
--- drivers/rilmodem/sim.c	2014-11-20 00:03:31 +0000
+++ drivers/rilmodem/sim.c	2015-02-04 00:09:49 +0000
@@ -586,42 +586,42 @@
 
 	DBG("setting aid_str (AID) to: %s", sd->aid_str);
 	switch (app->app_state) {
-	case APPSTATE_PIN:
+	case RIL_APPSTATE_PIN:
 		sd->passwd_state = OFONO_SIM_PASSWORD_SIM_PIN;
 		break;
-	case APPSTATE_PUK:
+	case RIL_APPSTATE_PUK:
 		sd->passwd_state = OFONO_SIM_PASSWORD_SIM_PUK;
 		break;
-	case APPSTATE_SUBSCRIPTION_PERSO:
+	case RIL_APPSTATE_SUBSCRIPTION_PERSO:
 		switch (app->perso_substate) {
-		case PERSOSUBSTATE_SIM_NETWORK:
+		case RIL_PERSOSUBSTATE_SIM_NETWORK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNET_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_NETWORK_SUBSET:
+		case RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNETSUB_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_CORPORATE:
+		case RIL_PERSOSUBSTATE_SIM_CORPORATE:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHCORP_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_SERVICE_PROVIDER:
+		case RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHSP_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_SIM:
+		case RIL_PERSOSUBSTATE_SIM_SIM:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHSIM_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_NETWORK_PUK:
+		case RIL_PERSOSUBSTATE_SIM_NETWORK_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNET_PUK;
 			break;
-		case PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK:
+		case RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNETSUB_PUK;
 			break;
-		case PERSOSUBSTATE_SIM_CORPORATE_PUK:
+		case RIL_PERSOSUBSTATE_SIM_CORPORATE_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHCORP_PUK;
 			break;
-		case PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK:
+		case RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHSP_PUK;
 			break;
-		case PERSOSUBSTATE_SIM_SIM_PUK:
+		case RIL_PERSOSUBSTATE_SIM_SIM_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHFSIM_PUK;
 			break;
 		default:
@@ -629,11 +629,11 @@
 			break;
 		};
 		break;
-	case APPSTATE_READY:
+	case RIL_APPSTATE_READY:
 		sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
 		break;
-	case APPSTATE_UNKNOWN:
-	case APPSTATE_DETECTED:
+	case RIL_APPSTATE_UNKNOWN:
+	case RIL_APPSTATE_DETECTED:
 	default:
 		sd->passwd_state = OFONO_SIM_PASSWORD_INVALID;
 		break;

=== modified file 'drivers/rilmodem/voicecall.c'
--- drivers/rilmodem/voicecall.c	2014-04-25 16:10:01 +0000
+++ drivers/rilmodem/voicecall.c	2015-02-04 00:09:49 +0000
@@ -33,6 +33,8 @@
 
 #include <glib.h>
 
+#include <ofono.h>
+
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/voicecall.h>
@@ -56,6 +58,9 @@
 /* To use with change_state_req::affected_types */
 #define AFFECTED_STATES_ALL 0x3F
 
+/* Auto-answer delay in seconds */
+#define AUTO_ANSWER_DELAY_S 3
+
 struct release_id_req {
 	struct ofono_voicecall *vc;
 	ofono_voicecall_cb_t cb;
@@ -100,6 +105,47 @@
 	ofono_voicecall_disconnected(vc, reqdata->id, reason, NULL);
 }
 
+static gboolean auto_answer_call(gpointer user_data)
+{
+	struct ofono_voicecall *vc = user_data;
+
+	DBG("");
+
+	ril_answer(vc, NULL, NULL);
+
+	return FALSE;
+}
+
+static gboolean is_auto_answer(struct ril_voicecall_data *vd,
+				struct ofono_call* call)
+{
+	static const char test_mcc_mnc_1[] = "00101";
+	static const char test_mcc_mnc_2[] = "001001";
+
+	const char *imsi;
+	struct ofono_sim *sim;
+
+	if (call->status != CALL_STATUS_INCOMING)
+		return FALSE;
+
+	sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, vd->modem);
+	if (sim == NULL)
+		return FALSE;
+
+	imsi = ofono_sim_get_imsi(sim);
+	if (imsi == NULL)
+		return FALSE;
+
+	if (strncmp(imsi, test_mcc_mnc_1, sizeof(test_mcc_mnc_1) - 1) == 0 ||
+		strncmp(imsi, test_mcc_mnc_2, sizeof(test_mcc_mnc_2) - 1)
+			== 0) {
+		ofono_info("Auto answering incoming call, imsi is %s", imsi);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void clcc_poll_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_voicecall *vc = user_data;
@@ -151,6 +197,7 @@
 			/* new call, signal it */
 			if (nc->type) {
 				ofono_voicecall_notify(vc, nc);
+
 				if (vd->cb) {
 					struct ofono_error error;
 					ofono_voicecall_cb_t cb = vd->cb;
@@ -160,6 +207,10 @@
 					vd->data = NULL;
 				}
 
+				if (is_auto_answer(vd, nc))
+					g_timeout_add_seconds(
+							AUTO_ANSWER_DELAY_S,
+							auto_answer_call, vc);
 			}
 
 			n = n->next;
@@ -677,11 +728,13 @@
 	return FALSE;
 }
 
-void ril_voicecall_start(GRil *ril, struct ofono_voicecall *vc,
+void ril_voicecall_start(struct ril_voicecall_driver_data *driver_data,
+				struct ofono_voicecall *vc,
 				unsigned int vendor,
 				struct ril_voicecall_data *vd)
 {
-	vd->ril = g_ril_clone(ril);
+	vd->ril = g_ril_clone(driver_data->gril);
+	vd->modem = driver_data->modem;
 	vd->vendor = vendor;
 	vd->cb = NULL;
 	vd->data = NULL;
@@ -703,14 +756,14 @@
 int ril_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
 			void *data)
 {
-	GRil *ril = data;
+	struct ril_voicecall_driver_data *driver_data = data;
 	struct ril_voicecall_data *vd;
 
 	vd = g_try_new0(struct ril_voicecall_data, 1);
 	if (vd == NULL)
 		return -ENOMEM;
 
-	ril_voicecall_start(ril, vc, vendor, vd);
+	ril_voicecall_start(driver_data, vc, vendor, vd);
 
 	return 0;
 }

=== modified file 'drivers/rilmodem/voicecall.h'
--- drivers/rilmodem/voicecall.h	2014-03-20 07:46:16 +0000
+++ drivers/rilmodem/voicecall.h	2015-02-04 00:09:49 +0000
@@ -25,6 +25,7 @@
 	unsigned int local_release;
 	unsigned int clcc_source;
 	GRil *ril;
+	struct ofono_modem *modem;
 	unsigned int vendor;
 	unsigned char flags;
 	ofono_voicecall_cb_t cb;
@@ -62,7 +63,8 @@
 void ril_release_all_active(struct ofono_voicecall *vc,
 				ofono_voicecall_cb_t cb, void *data);
 
-void ril_voicecall_start(GRil *ril, struct ofono_voicecall *vc,
+void ril_voicecall_start(struct ril_voicecall_driver_data *driver_data,
+				struct ofono_voicecall *vc,
 				unsigned int vendor,
 				struct ril_voicecall_data *vd);
 void ril_call_state_notify(struct ril_msg *message, gpointer user_data);

=== modified file 'gril/grilreply.c'
--- gril/grilreply.c	2014-11-20 00:03:31 +0000
+++ gril/grilreply.c	2015-02-04 00:09:49 +0000
@@ -1157,7 +1157,7 @@
 						const struct ril_msg *message)
 {
 	struct parcel rilp;
-	int numint, net_type;
+	int numint, parcel_net_type, net_type;
 
 	g_ril_init_parcel(message, &rilp);
 
@@ -1167,7 +1167,27 @@
 		goto error;
 	}
 
-	net_type = parcel_r_int32(&rilp);
+	parcel_net_type = parcel_r_int32(&rilp);
+	net_type = parcel_net_type;
+
+	/* Try to translate special MTK settings */
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+		switch (net_type) {
+		/* 4G preferred */
+		case MTK_PREF_NET_TYPE_LTE_GSM_WCDMA:
+		case MTK_PREF_NET_TYPE_LTE_GSM_WCDMA_MMDC:
+		case MTK_PREF_NET_TYPE_LTE_GSM_TYPE:
+		case MTK_PREF_NET_TYPE_LTE_GSM_MMDC_TYPE:
+			net_type = PREF_NET_TYPE_LTE_GSM_WCDMA;
+			break;
+		/* 3G or 2G preferred over LTE */
+		case MTK_PREF_NET_TYPE_GSM_WCDMA_LTE:
+		case MTK_PREF_NET_TYPE_GSM_WCDMA_LTE_MMDC:
+			net_type = PREF_NET_TYPE_GSM_WCDMA;
+			break;
+		}
+	}
+
 	if (net_type < 0 || net_type > PREF_NET_TYPE_LTE_ONLY) {
 		ofono_error("%s: unknown network type", __func__);
 		goto error;
@@ -1178,7 +1198,7 @@
 		goto error;
 	}
 
-	g_ril_append_print_buf(gril, "{%d}", net_type);
+	g_ril_append_print_buf(gril, "{%d}", parcel_net_type);
 	g_ril_print_response(gril, message);
 
 	return net_type;

=== modified file 'gril/grilrequest.c'
--- gril/grilrequest.c	2014-07-29 06:11:22 +0000
+++ gril/grilrequest.c	2015-02-04 00:09:49 +0000
@@ -399,6 +399,14 @@
 	parcel_w_string(rilp, NULL);       /* pin2; only req'd for writes */
 	parcel_w_string(rilp, req->aid_str); /* AID (Application ID) */
 
+	/*
+	 * sessionId, specific to latest MTK modems (harmless for older ones).
+	 * It looks like this field selects one or another SIM application, but
+	 * we use only one at a time so using zero here seems safe.
+	 */
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+		parcel_w_int32(rilp, 0);
+
 	return TRUE;
 
 error:
@@ -429,6 +437,10 @@
 	parcel_w_string(rilp, NULL);          /* pin2; only req'd for writes */
 	parcel_w_string(rilp, req->aid_str);
 
+	/* sessionId, specific to latest MTK modems (harmless for older ones) */
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+		parcel_w_int32(rilp, 0);
+
 	return TRUE;
 
 error:
@@ -459,6 +471,10 @@
 	parcel_w_string(rilp, NULL);       /* pin2; only req'd for writes */
 	parcel_w_string(rilp, req->aid_str); /* AID (Application ID) */
 
+	/* sessionId, specific to latest MTK modems (harmless for older ones) */
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+		parcel_w_int32(rilp, 0);
+
 	return TRUE;
 
 error:
@@ -494,6 +510,10 @@
 	parcel_w_string(rilp, NULL);		/* pin2; only for FDN/BDN */
 	parcel_w_string(rilp, req->aid_str);	/* AID (Application ID) */
 
+	/* sessionId, specific to latest MTK modems (harmless for older ones) */
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+		parcel_w_int32(rilp, 0);
+
 	g_ril_append_print_buf(gril,
 				"%s%d,%d,%d,%s,pin2=(null),aid=%s)",
 				print_buf,
@@ -555,6 +575,10 @@
 	parcel_w_string(rilp, NULL);		/* pin2; only for FDN/BDN */
 	parcel_w_string(rilp, req->aid_str);	/* AID (Application ID) */
 
+	/* sessionId, specific to latest MTK modems (harmless for older ones) */
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+		parcel_w_int32(rilp, 0);
+
 	g_ril_append_print_buf(gril,
 				"%s%d,%d,%d,%s,pin2=(null),aid=%s)",
 				print_buf,
@@ -1057,3 +1081,36 @@
 	g_ril_append_print_buf(gril, "(%s)", hex_dump? hex_dump: "(null)");
 	g_free(hex_dump);
 }
+
+void g_ril_request_set_initial_attach_apn(GRil *gril, const char *apn,
+						int proto,
+						const char *user,
+						const char *passwd,
+						const char *mccmnc,
+						struct parcel *rilp)
+{
+	const char *proto_str;
+	const int auth_type = RIL_AUTH_ANY;
+
+	parcel_init(rilp);
+
+	parcel_w_string(rilp, apn);
+
+	proto_str = ril_ofono_protocol_to_ril_string(proto);
+	parcel_w_string(rilp, proto_str);
+
+	parcel_w_int32(rilp, auth_type);
+	parcel_w_string(rilp, user);
+	parcel_w_string(rilp, passwd);
+
+	g_ril_append_print_buf(gril, "(%s,%s,%s,%s,%s", apn, proto_str,
+				ril_authtype_to_string(auth_type),
+				user, passwd);
+
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+		parcel_w_string(rilp, mccmnc);
+		g_ril_append_print_buf(gril, "%s,%s)", print_buf, mccmnc);
+	} else {
+		g_ril_append_print_buf(gril, "%s)", print_buf);
+	}
+}

=== modified file 'gril/grilrequest.h'
--- gril/grilrequest.h	2014-07-29 06:11:22 +0000
+++ gril/grilrequest.h	2015-02-04 00:09:49 +0000
@@ -269,6 +269,13 @@
 void g_ril_request_oem_hook_raw(GRil *gril, const void *payload, size_t length,
 					struct parcel *rilp);
 
+void g_ril_request_set_initial_attach_apn(GRil *gril, const char *apn,
+						int proto,
+						const char *user,
+						const char *passwd,
+						const char *mccmnc,
+						struct parcel *rilp);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'gril/grilutil.c'
--- gril/grilutil.c	2014-04-29 15:50:22 +0000
+++ gril/grilutil.c	2015-02-04 00:09:49 +0000
@@ -123,6 +123,24 @@
 	}
 }
 
+const char *ril_authtype_to_string(int auth_type)
+{
+	switch (auth_type) {
+	case RIL_AUTH_NONE:
+		return "NONE";
+	case RIL_AUTH_PAP:
+		return "PAP";
+	case RIL_AUTH_CHAP:
+		return "CHAP";
+	case RIL_AUTH_BOTH:
+		return "BOTH";
+	case RIL_AUTH_ANY:
+		return "ANY";
+	default:
+		return "<INVALID>";
+	}
+}
+
 const char *ril_cardstate_to_string(int card_state)
 {
 	switch (card_state) {
@@ -475,6 +493,8 @@
 		return "RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU";
 	case RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS:
 		return "RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS";
+	case RIL_REQUEST_SET_INITIAL_ATTACH_APN:
+		return "RIL_REQUEST_SET_INITIAL_ATTACH_APN";
 	default:
 		return "<INVALID>";
 	}

=== modified file 'gril/grilutil.h'
--- gril/grilutil.h	2014-04-29 15:50:22 +0000
+++ gril/grilutil.h	2015-02-04 00:09:49 +0000
@@ -35,6 +35,7 @@
 int ril_protocol_string_to_ofono_protocol(gchar *protocol_str);
 const char *ril_appstate_to_string(int app_state);
 const char *ril_apptype_to_string(int app_type);
+const char *ril_authtype_to_string(int auth_type);
 const char *ril_cardstate_to_string(int card_state);
 const char *ril_error_to_string(int error);
 const char *ril_pinstate_to_string(int pin_state);

=== modified file 'gril/ril_constants.h'
--- gril/ril_constants.h	2014-09-22 16:06:53 +0000
+++ gril/ril_constants.h	2015-02-04 00:09:49 +0000
@@ -73,6 +73,14 @@
 #define PREF_NET_TYPE_LTE_CMDA_EVDO_GSM_WCDMA 10
 #define PREF_NET_TYPE_LTE_ONLY 11
 #define PREF_NET_TYPE_LTE_WCDMA 12
+/* MTK specific network types */
+#define MTK_PREF_NET_TYPE_BASE 30
+#define MTK_PREF_NET_TYPE_LTE_GSM_WCDMA (MTK_PREF_NET_TYPE_BASE + 1)
+#define MTK_PREF_NET_TYPE_LTE_GSM_WCDMA_MMDC (MTK_PREF_NET_TYPE_BASE + 2)
+#define MTK_PREF_NET_TYPE_GSM_WCDMA_LTE (MTK_PREF_NET_TYPE_BASE + 3)
+#define MTK_PREF_NET_TYPE_GSM_WCDMA_LTE_MMDC (MTK_PREF_NET_TYPE_BASE + 4)
+#define MTK_PREF_NET_TYPE_LTE_GSM_TYPE (MTK_PREF_NET_TYPE_BASE + 5)
+#define MTK_PREF_NET_TYPE_LTE_GSM_MMDC_TYPE (MTK_PREF_NET_TYPE_BASE + 6)
 
 /*
  * Data Call Failure causes ( see TS 24.008 )
@@ -172,6 +180,13 @@
 /* MTK specific profile for MMS */
 #define RIL_DATA_PROFILE_MTK_MMS (RIL_DATA_PROFILE_OEM_BASE + 1)
 
+/*
+ * auth type -1 seems to mean 0 (RIL_AUTH_NONE) if no user/password is
+ * specified or 3 (RIL_AUTH_BOTH) otherwise. See $ANDROID/packages/
+ * providers/TelephonyProvider/src/com/android/providers/telephony/
+ * TelephonyProvider.java.
+ */
+#define RIL_AUTH_ANY -1
 #define RIL_AUTH_NONE 0
 #define RIL_AUTH_PAP 1
 #define RIL_AUTH_CHAP 2
@@ -206,6 +221,33 @@
 #define RIL_APPTYPE_CSIM 4
 #define RIL_APPTYPE_ISIM 5
 
+/* SIM - PersoSubstate */
+#define RIL_PERSOSUBSTATE_UNKNOWN 0
+#define RIL_PERSOSUBSTATE_IN_PROGRESS 1
+#define RIL_PERSOSUBSTATE_READY 2
+#define RIL_PERSOSUBSTATE_SIM_NETWORK 3
+#define RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET 4
+#define RIL_PERSOSUBSTATE_SIM_CORPORATE 5
+#define RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER 6
+#define RIL_PERSOSUBSTATE_SIM_SIM 7
+#define RIL_PERSOSUBSTATE_SIM_NETWORK_PUK 8
+#define RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK 9
+#define RIL_PERSOSUBSTATE_SIM_CORPORATE_PUK 10
+#define RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK 11
+#define RIL_PERSOSUBSTATE_SIM_SIM_PUK 12
+#define RIL_PERSOSUBSTATE_RUIM_NETWORK1 13
+#define RIL_PERSOSUBSTATE_RUIM_NETWORK2 14
+#define RIL_PERSOSUBSTATE_RUIM_HRPD 15
+#define RIL_PERSOSUBSTATE_RUIM_CORPORATE 16
+#define RIL_PERSOSUBSTATE_RUIM_SERVICE_PROVIDER 17
+#define RIL_PERSOSUBSTATE_RUIM_RUIM 18
+#define RIL_PERSOSUBSTATE_RUIM_NETWORK1_PUK 19
+#define RIL_PERSOSUBSTATE_RUIM_NETWORK2_PUK 20
+#define RIL_PERSOSUBSTATE_RUIM_HRPD_PUK 21
+#define RIL_PERSOSUBSTATE_RUIM_CORPORATE_PUK 22
+#define RIL_PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_PUK 23
+#define RIL_PERSOSUBSTATE_RUIM_RUIM_PUK 24
+
 /* RIL Request Messages */
 #define RIL_REQUEST_GET_SIM_STATUS 1
 #define RIL_REQUEST_ENTER_SIM_PIN 2
@@ -316,6 +358,7 @@
 #define RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU 106
 #define RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS 107
 #define RIL_REQUEST_VOICE_RADIO_TECH 108
+#define RIL_REQUEST_SET_INITIAL_ATTACH_APN 111
 
 /* RIL Unsolicited Messages */
 #define RIL_UNSOL_RESPONSE_BASE 1000

=== removed file 'gril/ringbuffer.h'
--- gril/ringbuffer.h	2013-09-09 19:21:32 +0000
+++ gril/ringbuffer.h	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-/*
- *
- *  AT chat library with GLib integration
- *
- *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-struct ring_buffer;
-
-/*!
- * Creates a new ring buffer with capacity size
- */
-struct ring_buffer *ring_buffer_new(unsigned int size);
-
-/*!
- * Frees the resources allocated for the ring buffer
- */
-void ring_buffer_free(struct ring_buffer *buf);
-
-/*!
- * Returns the capacity of the ring buffer
- */
-int ring_buffer_capacity(struct ring_buffer *buf);
-
-/*!
- * Resets the ring buffer, all data inside the buffer is lost
- */
-void ring_buffer_reset(struct ring_buffer *buf);
-
-/*!
- * Writes data of size len into the ring buffer buf.  Returns -1 if the
- * write failed or the number of bytes written
- */
-int ring_buffer_write(struct ring_buffer *buf, const void *data,
-			unsigned int len);
-
-/*!
- * Advances the write counter by len, this is meant to be used with
- * the ring_buffer_write_ptr function.  Returns the number of bytes
- * actually advanced (the capacity of the buffer)
- */
-int ring_buffer_write_advance(struct ring_buffer *buf, unsigned int len);
-
-/*!
- * Returns the write pointer with write offset specified by offset.  Careful
- * not to write past the end of the buffer.  Use the ring_buffer_avail_no_wrap
- * function, and ring_buffer_write_advance.
- */
-unsigned char *ring_buffer_write_ptr(struct ring_buffer *buf,
-					unsigned int offset);
-
-/*!
- * Returns the number of free bytes available in the buffer
- */
-int ring_buffer_avail(struct ring_buffer *buf);
-
-/*!
- * Returns the number of free bytes available in the buffer without wrapping
- */
-int ring_buffer_avail_no_wrap(struct ring_buffer *buf);
-
-/*!
- * Reads data from the ring buffer buf into memory region pointed to by data.
- * A maximum of len bytes will be read.  Returns -1 if the read failed or
- * the number of bytes read
- */
-int ring_buffer_read(struct ring_buffer *buf, void *data,
-			unsigned int len);
-
-/*!
- * Returns the read pointer with read offset specified by offset.  No bounds
- * checking is performed.  Be careful not to read past the end of the buffer.
- * Use the ring_buffer_len_no_wrap function, and ring_buffer_drain.
- */
-unsigned char *ring_buffer_read_ptr(struct ring_buffer *buf,
-					unsigned int offset);
-
-/*!
- * Returns the number of bytes currently available to be read in the buffer
- */
-int ring_buffer_len(struct ring_buffer *buf);
-
-/*!
- * Returns the number of bytes currently available to be read in the buffer
- * without wrapping.
- */
-int ring_buffer_len_no_wrap(struct ring_buffer *buf);
-
-/*!
- * Drains the ring buffer of len bytes.  Returns the number of bytes the
- * read counter was actually advanced.
- */
-int ring_buffer_drain(struct ring_buffer *buf, unsigned int len);

=== modified file 'include/gprs-context.h'
--- include/gprs-context.h	2012-07-16 01:05:23 +0000
+++ include/gprs-context.h	2015-02-04 00:09:49 +0000
@@ -46,6 +46,7 @@
 	OFONO_GPRS_CONTEXT_TYPE_MMS,
 	OFONO_GPRS_CONTEXT_TYPE_WAP,
 	OFONO_GPRS_CONTEXT_TYPE_IMS,
+	OFONO_GPRS_CONTEXT_TYPE_IA,
 };
 
 struct ofono_gprs_primary_context {

=== modified file 'include/gprs.h'
--- include/gprs.h	2011-10-10 20:39:42 +0000
+++ include/gprs.h	2015-02-04 00:09:49 +0000
@@ -27,6 +27,7 @@
 #endif
 
 #include <ofono/types.h>
+#include <ofono/gprs-context.h>
 
 struct ofono_gprs;
 struct ofono_gprs_context;
@@ -45,6 +46,10 @@
 				ofono_gprs_cb_t cb, void *data);
 	void (*attached_status)(struct ofono_gprs *gprs,
 					ofono_gprs_status_cb_t cb, void *data);
+	void (*set_ia_apn)(struct ofono_gprs *gprs, const char *apn,
+				enum ofono_gprs_proto proto, const char *user,
+				const char *passwd, const char *mccmnc,
+				ofono_gprs_cb_t cb, void *data);
 };
 
 enum gprs_suspend_cause {

=== modified file 'plugins/mbpi.c'
--- plugins/mbpi.c	2013-10-02 07:11:31 +0000
+++ plugins/mbpi.c	2015-02-04 00:09:49 +0000
@@ -73,6 +73,7 @@
 		_(OFONO_GPRS_CONTEXT_TYPE_MMS);
 		_(OFONO_GPRS_CONTEXT_TYPE_WAP);
 		_(OFONO_GPRS_CONTEXT_TYPE_IMS);
+		_(OFONO_GPRS_CONTEXT_TYPE_IA);
 	}
 
 	return "OFONO_GPRS_CONTEXT_TYPE_<UNKNOWN>";

=== modified file 'plugins/mtk.c'
--- plugins/mtk.c	2014-11-17 15:43:35 +0000
+++ plugins/mtk.c	2015-02-04 00:09:49 +0000
@@ -56,7 +56,9 @@
 
 #include "ofono.h"
 
+#include <gril.h>
 #include <grilreply.h>
+#include <grilrequest.h>
 #include <grilunsol.h>
 
 #include "drivers/rilmodem/rilmodem.h"
@@ -67,6 +69,7 @@
 #include "drivers/mtkmodem/mtkutil.h"
 #include "drivers/mtkmodem/mtkrequest.h"
 #include "drivers/mtkmodem/mtkreply.h"
+#include "drivers/mtkmodem/mtkunsol.h"
 #include "drivers/mtkmodem/mtksettings.h"
 
 #define MAX_SIM_STATUS_RETRIES 15
@@ -87,13 +90,19 @@
 
 #define T_WAIT_DISCONN_MS 1000
 
+enum mtk_sim_type {
+	MTK_SIM_TYPE_1 = 1,
+	MTK_SIM_TYPE_2 = 2,
+	MTK_SIM_TYPE_3 = 3
+};
+
 static const char hex_slot_0[] = "Slot 0: ";
 static const char hex_slot_1[] = "Slot 1: ";
 
 typedef void (*pending_cb_t)(struct cb_data *cbd);
 
 struct mtk_data {
-	GRil *modem;
+	GRil *ril;
 	int sim_status_retries;
 	ofono_bool_t ofono_online;
 	ofono_bool_t ofono_online_target;
@@ -120,9 +129,10 @@
 	struct ofono_phonebook *phonebook;
 	struct ofono_gprs *gprs;
 	struct ofono_message_waiting *message_waiting;
-	struct ofono_modem *ofono_modem;
+	struct ofono_modem *modem;
 	ofono_bool_t has_3g;
 	struct mtk_settings_data *mtk_settings;
+	int fw_type;
 };
 
 /*
@@ -131,15 +141,15 @@
  * only through the socket for slot 0. So we need a pointer to the main socket.
  * Also, we need to access information of one channel from the other channel.
  */
-static struct mtk_data *mtk_0;
-static struct mtk_data *mtk_1;
+static struct mtk_data *mtk_data_0;
+static struct mtk_data *mtk_data_1;
 
 /* Some variables control global state of the modem and are then static */
 static gboolean disconnect_expected;
 static guint not_disconn_cb_id;
 
 struct socket_data {
-	GRil *gril;
+	GRil *ril;
 	const char *path;
 	int radio_state;
 	guint radio_state_ev_id;
@@ -153,7 +163,7 @@
 				ofono_modem_online_cb_t callback, void *data);
 static void query_3g_caps(struct socket_data *sock);
 static void socket_disconnected(gpointer user_data);
-static void start_slot(struct mtk_data *ril, struct socket_data *sock,
+static void start_slot(struct mtk_data *md, struct socket_data *sock,
 			const char *hex_prefix);
 
 static void mtk_debug(const char *str, void *user_data)
@@ -163,12 +173,12 @@
 	ofono_info("%s%s", prefix, str);
 }
 
-static struct mtk_data *ril_complement(struct mtk_data *ril)
+static struct mtk_data *mtk_data_complement(struct mtk_data *md)
 {
-	if (ril->slot == MULTISIM_SLOT_0)
-		return mtk_1;
+	if (md->slot == MULTISIM_SLOT_0)
+		return mtk_data_1;
 	else
-		return mtk_0;
+		return mtk_data_0;
 }
 
 static struct socket_data *socket_complement(struct socket_data *sock)
@@ -196,17 +206,17 @@
 
 void mtk_set_attach_state(struct ofono_modem *modem, ofono_bool_t attached)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
-	ril->gprs_attach = attached;
+	md->gprs_attach = attached;
 }
 
 static void detach_received_cb(struct ril_msg *message, gpointer user_data)
 {
-	struct mtk_data *ril = user_data;
+	struct mtk_data *md = user_data;
 
 	if (message->error == RIL_E_SUCCESS)
-		g_ril_print_response_no_args(ril->modem, message);
+		g_ril_print_response_no_args(md->ril, message);
 	else
 		ofono_error("%s: RIL error %s", __func__,
 				ril_error_to_string(message->error));
@@ -214,18 +224,18 @@
 
 void mtk_detach_received(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
-	struct mtk_data *ril_c = ril_complement(ril);
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	struct mtk_data *md_c = mtk_data_complement(md);
 
-	if (ril_c != NULL && ril_c->gprs_attach) {
+	if (md_c != NULL && md_c->gprs_attach) {
 		struct parcel rilp;
 
-		g_mtk_request_set_gprs_connect_type(ril_c->modem,
-						ril_c->gprs_attach, &rilp);
+		g_mtk_request_set_gprs_connect_type(md_c->ril,
+						md_c->gprs_attach, &rilp);
 
-		if (g_ril_send(ril_c->modem,
+		if (g_ril_send(md_c->ril,
 				MTK_RIL_REQUEST_SET_GPRS_CONNECT_TYPE,
-				&rilp, detach_received_cb, ril_c, NULL) == 0)
+				&rilp, detach_received_cb, md_c, NULL) == 0)
 			ofono_error("%s: send failed", __func__);
 	}
 }
@@ -233,7 +243,7 @@
 static void radio_state_changed(struct ril_msg *message, gpointer user_data)
 {
 	struct socket_data *sock = user_data;
-	int radio_state = g_ril_unsol_parse_radio_state_changed(sock->gril,
+	int radio_state = g_ril_unsol_parse_radio_state_changed(sock->ril,
 								message);
 
 	if (radio_state != sock->radio_state) {
@@ -247,9 +257,9 @@
 		 * who owns the 3G capabilities in case both slots have already
 		 * radio state different from UNAVAILABLE.
 		 */
-		if (mtk_1 == NULL) {
-			mtk_0->has_3g = TRUE;
-			start_slot(mtk_0, sock, hex_slot_0);
+		if (mtk_data_1 == NULL) {
+			mtk_data_0->has_3g = TRUE;
+			start_slot(mtk_data_0, sock, hex_slot_0);
 		} else if (sock->radio_state == RADIO_STATE_UNAVAILABLE &&
 				sock_c != NULL && sock_c->radio_state !=
 						RADIO_STATE_UNAVAILABLE) {
@@ -263,18 +273,18 @@
 static void mtk_radio_state_changed(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
-	int radio_state = g_ril_unsol_parse_radio_state_changed(ril->modem,
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	int radio_state = g_ril_unsol_parse_radio_state_changed(md->ril,
 								message);
 
-	if (radio_state != ril->radio_state) {
+	if (radio_state != md->radio_state) {
 
-		ofono_info("%s, slot %d: state: %s ril->ofono_online: %d",
-				__func__, ril->slot,
+		ofono_info("%s, slot %d: state: %s md->ofono_online: %d",
+				__func__, md->slot,
 				ril_radio_state_to_string(radio_state),
-				ril->ofono_online);
+				md->ofono_online);
 
-		ril->radio_state = radio_state;
+		md->radio_state = radio_state;
 
 		switch (radio_state) {
 		case RADIO_STATE_ON:
@@ -286,9 +296,9 @@
 
 		case RADIO_STATE_UNAVAILABLE:
 		case RADIO_STATE_OFF:
-			if (ril->ofono_online) {
+			if (md->ofono_online) {
 				ofono_warn("%s, slot %d: radio powered off!",
-						__func__, ril->slot);
+						__func__, md->slot);
 			}
 			break;
 		default:
@@ -298,14 +308,48 @@
 	}
 }
 
+static void reg_suspended_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: RIL error %s", __func__,
+				ril_error_to_string(message->error));
+		return;
+	}
+
+	g_ril_print_response_no_args(md->ril, message);
+}
+
+static void reg_suspended(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	struct parcel rilp;
+	int session_id;
+
+	session_id = g_mtk_unsol_parse_registration_suspended(md->ril, message);
+	if (session_id < 0) {
+		ofono_error("%s: parse error", __func__);
+		return;
+	}
+
+	g_mtk_request_resume_registration(md->ril, session_id, &rilp);
+
+	if (g_ril_send(md->ril, MTK_RIL_REQUEST_RESUME_REGISTRATION, &rilp,
+			reg_suspended_cb, modem, NULL) == 0)
+		ofono_error("%s: failure sending request", __func__);
+}
+
 static void sim_removed(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
 	DBG("");
 
-	g_ril_print_unsol_no_args(ril->modem, message);
+	g_ril_print_unsol_no_args(md->ril, message);
 
 	ofono_modem_set_powered(modem, FALSE);
 	g_idle_add(mtk_connected, modem);
@@ -314,11 +358,11 @@
 static void sim_inserted(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
 	DBG("");
 
-	g_ril_print_unsol_no_args(ril->modem, message);
+	g_ril_print_unsol_no_args(md->ril, message);
 
 	if (getenv("OFONO_RIL_HOT_SIM_SWAP")) {
 		ofono_modem_set_powered(modem, FALSE);
@@ -326,65 +370,203 @@
 	}
 }
 
+static void set_trm_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: RIL error %s", __func__,
+				ril_error_to_string(message->error));
+		return;
+	}
+
+	g_ril_print_response_no_args(md->ril, message);
+
+	/*
+	 * rild will close now the socket, so we set our state to power off:
+	 * we will set the modem to powered when we reconnect to the socket.
+	 * Measurements showed that rild takes around 5 seconds to re-start, but
+	 * we use an 8 seconds timeout as times can vary and that value is also
+	 * compatible with krillin modem.
+	 */
+	md->ofono_online = FALSE;
+	ofono_modem_set_powered(md->modem, FALSE);
+}
+
+static void store_type_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	struct parcel rilp;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: RIL error %s", __func__,
+				ril_error_to_string(message->error));
+		return;
+	}
+
+	g_ril_print_response_no_args(md->ril, message);
+
+	/*
+	 * Send SET_TRM, which reloads the FW. We do not know the meaning of the
+	 * magic number 0x0B.
+	 */
+	g_mtk_request_set_trm(md->ril, 0x0B, &rilp);
+
+	if (g_ril_send(md->ril, MTK_RIL_REQUEST_SET_TRM, &rilp,
+			set_trm_cb, modem, NULL) == 0)
+		ofono_error("%s: failure sending request", __func__);
+}
+
+static gboolean find_in_table(const char *str,
+				const char **table, int num_elem)
+{
+	int i;
+
+	for (i = 0; i < num_elem; ++i)
+		if (strncmp(str, table[i], strlen(table[i])) == 0)
+			return TRUE;
+
+	return FALSE;
+}
+
+static enum mtk_sim_type sim_type_for_fw_loading(const char *imsi)
+{
+	/* China Mobile MCC/MNC codes */
+	const char *table_type1[] = { "46000", "46002", "46007" };
+	/* China Unicom and China Telecom MCC/MNC codes */
+	const char *table_type3[] =
+		{ "46001", "46006", "46009", "45407", "46005", "45502" };
+
+	if (find_in_table(imsi, table_type1,
+				sizeof(table_type1)/sizeof(table_type1[0])))
+		return MTK_SIM_TYPE_1;
+
+	if (find_in_table(imsi, table_type3,
+				sizeof(table_type3)/sizeof(table_type3[0])))
+		return MTK_SIM_TYPE_3;
+
+	return MTK_SIM_TYPE_2;
+}
+
+static int sim_modem_fw(const char *imsi)
+{
+	enum mtk_sim_type sim_type;
+	int sim_fw = MTK_MD_TYPE_LWG;
+
+	/* Find out our SIM type */
+	sim_type = sim_type_for_fw_loading(imsi);
+	switch (sim_type) {
+	case MTK_SIM_TYPE_1:
+		/* LTE TDD - TD-SCDMA - GSM */
+		sim_fw = MTK_MD_TYPE_LTG;
+		break;
+	case MTK_SIM_TYPE_2:
+	case MTK_SIM_TYPE_3:
+		/* LTE FDD - WCDMA - GSM */
+		sim_fw = MTK_MD_TYPE_LWG;
+		break;
+	};
+
+	return sim_fw;
+}
+
+static void set_fw_type(struct ofono_modem *modem, int type)
+{
+	ofono_bool_t lte_cap;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+
+	md->fw_type = type;
+
+	lte_cap = (type >= MTK_MD_TYPE_LWG) ? TRUE : FALSE;
+	ofono_modem_set_boolean(modem, MODEM_PROP_LTE_CAPABLE, lte_cap);
+}
+
+static void check_modem_fw(struct ofono_modem *modem)
+{
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	int sim_type;
+	struct parcel rilp;
+
+	/* We handle only LWG <-> LTG modem fw changes (arale case) */
+	if (md->fw_type != MTK_MD_TYPE_LTG && md->fw_type != MTK_MD_TYPE_LWG)
+		return;
+
+	/* Right modem fw type for our SIM */
+	sim_type = sim_modem_fw(ofono_sim_get_imsi(md->sim));
+
+	if (md->fw_type == sim_type)
+		return;
+
+	set_fw_type(modem, sim_type);
+
+	g_mtk_request_store_modem_type(md->ril, sim_type, &rilp);
+
+	if (g_ril_send(md->ril, MTK_RIL_REQUEST_STORE_MODEM_TYPE, &rilp,
+			store_type_cb, modem, NULL) == 0)
+		ofono_error("%s: failure sending request", __func__);
+}
+
 static int mtk_probe(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = g_try_new0(struct mtk_data, 1);
+	struct mtk_data *md = g_try_new0(struct mtk_data, 1);
 
-	if (ril == NULL) {
+	if (md == NULL) {
 		errno = ENOMEM;
 		goto error;
 	}
 
-	ril->ofono_online = FALSE;
-	ril->radio_state = RADIO_STATE_UNAVAILABLE;
-
-	ril->slot = ofono_modem_get_integer(modem, "Slot");
-
-	if (ril->slot == MULTISIM_SLOT_0)
-		mtk_0 = ril;
+	md->ofono_online = FALSE;
+	md->radio_state = RADIO_STATE_UNAVAILABLE;
+
+	md->slot = ofono_modem_get_integer(modem, "Slot");
+
+	if (md->slot == MULTISIM_SLOT_0)
+		mtk_data_0 = md;
 	else
-		mtk_1 = ril;
-
-	DBG("slot %d", ril->slot);
-
-	ril->ofono_modem = modem;
-
-	ofono_modem_set_data(modem, ril);
+		mtk_data_1 = md;
+
+	DBG("slot %d", md->slot);
+
+	md->modem = modem;
+
+	ofono_modem_set_data(modem, md);
 
 	return 0;
 
 error:
-	g_free(ril);
+	g_free(md);
 
 	return -errno;
 }
 
 static void mtk_remove(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
 	ofono_modem_set_data(modem, NULL);
 
-	if (!ril)
+	if (!md)
 		return;
 
-	g_ril_unref(ril->modem);
+	g_ril_unref(md->ril);
 
-	g_free(ril);
+	g_free(md);
 }
 
 static void mtk_pre_sim(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
-	DBG("slot %d", ril->slot);
+	DBG("slot %d", md->slot);
 }
 
 static void mtk_post_sim(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
-	DBG("slot %d", ril->slot);
+	DBG("slot %d", md->slot);
 }
 
 /*
@@ -398,15 +580,15 @@
 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);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
 	if (new_state == OFONO_SIM_STATE_READY) {
 		struct ofono_gprs_context *gc;
-		struct mtk_gprs_data gprs_data = { ril->modem, modem };
+		struct ril_gprs_driver_data gprs_data = { md->ril, modem };
 		struct ril_gprs_context_data inet_ctx =
-			{ ril->modem, OFONO_GPRS_CONTEXT_TYPE_INTERNET };
+			{ md->ril, OFONO_GPRS_CONTEXT_TYPE_INTERNET };
 		struct ril_gprs_context_data mms_ctx =
-			{ ril->modem, OFONO_GPRS_CONTEXT_TYPE_MMS };
+			{ md->ril, OFONO_GPRS_CONTEXT_TYPE_MMS };
 
 		DBG("SIM ready, creating more atoms");
 
@@ -416,28 +598,28 @@
 		 *  - stk ( SIM toolkit )
 		 *  - radio_settings
 		 */
-		ril->sms = ofono_sms_create(modem, OFONO_RIL_VENDOR_MTK,
-						RILMODEM, ril->modem);
+		md->sms = ofono_sms_create(modem, OFONO_RIL_VENDOR_MTK,
+						RILMODEM, md->ril);
 
 		/* netreg needs access to the SIM (SPN, SPDI) */
-		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 =
+		md->netreg = ofono_netreg_create(modem, OFONO_RIL_VENDOR_MTK,
+							RILMODEM, md->ril);
+		md->ussd = ofono_ussd_create(modem, OFONO_RIL_VENDOR_MTK,
+						RILMODEM, md->ril);
+		md->call_settings =
 			ofono_call_settings_create(modem, OFONO_RIL_VENDOR_MTK,
-							RILMODEM, ril->modem);
-		ril->call_forwarding =
+							RILMODEM, md->ril);
+		md->call_forwarding =
 			ofono_call_forwarding_create(modem,
 							OFONO_RIL_VENDOR_MTK,
-							RILMODEM, ril->modem);
-		ril->call_barring =
+							RILMODEM, md->ril);
+		md->call_barring =
 			ofono_call_barring_create(modem, OFONO_RIL_VENDOR_MTK,
-							RILMODEM, ril->modem);
-		ril->phonebook =
+							RILMODEM, md->ril);
+		md->phonebook =
 			ofono_phonebook_create(modem, OFONO_RIL_VENDOR_MTK,
 						RILMODEM, modem);
-		ril->gprs = ofono_gprs_create(modem, OFONO_RIL_VENDOR_MTK,
+		md->gprs = ofono_gprs_create(modem, OFONO_RIL_VENDOR_MTK,
 						MTKMODEM, &gprs_data);
 
 		gc = ofono_gprs_context_create(modem, OFONO_RIL_VENDOR_MTK,
@@ -445,7 +627,7 @@
 		if (gc) {
 			ofono_gprs_context_set_type(gc,
 					OFONO_GPRS_CONTEXT_TYPE_INTERNET);
-			ofono_gprs_add_context(ril->gprs, gc);
+			ofono_gprs_add_context(md->gprs, gc);
 		}
 
 		gc = ofono_gprs_context_create(modem, OFONO_RIL_VENDOR_MTK,
@@ -453,78 +635,117 @@
 		if (gc) {
 			ofono_gprs_context_set_type(gc,
 					OFONO_GPRS_CONTEXT_TYPE_MMS);
-			ofono_gprs_add_context(ril->gprs, gc);
+			ofono_gprs_add_context(md->gprs, gc);
 		}
 
-		ril->message_waiting = ofono_message_waiting_create(modem);
-		if (ril->message_waiting)
-			ofono_message_waiting_register(ril->message_waiting);
+		md->message_waiting = ofono_message_waiting_create(modem);
+		if (md->message_waiting)
+			ofono_message_waiting_register(md->message_waiting);
+
+		/*
+		 * Now that we can access IMSI, see if a FW change is needed.
+		 * TODO: Roaming case and timeout case when no network is found.
+		 */
+		check_modem_fw(modem);
 
 	} 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->phonebook) {
-			ofono_phonebook_remove(ril->phonebook);
-			ril->phonebook = 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;
+		if (md->message_waiting) {
+			ofono_message_waiting_remove(md->message_waiting);
+			md->message_waiting = NULL;
+		}
+		if (md->gprs) {
+			ofono_gprs_remove(md->gprs);
+			md->gprs = NULL;
+		}
+		if (md->phonebook) {
+			ofono_phonebook_remove(md->phonebook);
+			md->phonebook = NULL;
+		}
+		if (md->call_barring) {
+			ofono_call_barring_remove(md->call_barring);
+			md->call_barring = NULL;
+		}
+		if (md->call_forwarding) {
+			ofono_call_forwarding_remove(md->call_forwarding);
+			md->call_forwarding = NULL;
+		}
+		if (md->call_settings) {
+			ofono_call_settings_remove(md->call_settings);
+			md->call_settings = NULL;
+		}
+		if (md->ussd) {
+			ofono_ussd_remove(md->ussd);
+			md->ussd = NULL;
+		}
+		if (md->netreg) {
+			ofono_netreg_remove(md->netreg);
+			md->netreg = NULL;
+		}
+		if (md->sms) {
+			ofono_sms_remove(md->sms);
+			md->sms = NULL;
 		}
 	}
 }
 
-static void mtk_post_online(struct ofono_modem *modem)
+static void create_online_atoms(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
-
-	DBG("slot %d", ril->slot);
-
-	ril->sim_data.gril = ril->modem;
-	ril->sim_data.modem = modem;
-	ril->sim_data.ril_state_watch = sim_state_watch;
-
-	ril->sim = ofono_sim_create(modem, OFONO_RIL_VENDOR_MTK,
-					RILMODEM, &ril->sim_data);
-	g_assert(ril->sim != NULL);
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	struct ril_radio_settings_driver_data rs_data = { md->ril, modem };
+
+	md->sim_data.gril = md->ril;
+	md->sim_data.modem = modem;
+	md->sim_data.ril_state_watch = sim_state_watch;
+
+	md->sim = ofono_sim_create(modem, OFONO_RIL_VENDOR_MTK,
+					RILMODEM, &md->sim_data);
+	g_assert(md->sim != NULL);
 
 	/* Radio settings does not depend on the SIM */
 	ofono_radio_settings_create(modem, OFONO_RIL_VENDOR_MTK,
-					MTKMODEM, ril->modem);
+					MTKMODEM, &rs_data);
+}
+
+static void query_type_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	int type;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: RIL error %s", __func__,
+				ril_error_to_string(message->error));
+		return;
+	}
+
+	type = g_mtk_reply_parse_query_modem_type(md->ril, message);
+	if (type < 0) {
+		ofono_error("%s: parse error", __func__);
+		return;
+	}
+
+	set_fw_type(modem, type);
+
+	create_online_atoms(modem);
+}
+
+static void mtk_post_online(struct ofono_modem *modem)
+{
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	DBG("slot %d", md->slot);
+
+	/* With modem powered we can query the type in krillin */
+	if (g_ril_send(md->ril, MTK_RIL_REQUEST_QUERY_MODEM_TYPE,
+			NULL, query_type_cb, md->modem, NULL) == 0)
+		ofono_error("%s: failure sending QUERY_MODEM_TYPE", __func__);
 
 	/* Register for changes in SIM insertion */
-	g_ril_register(ril->modem, MTK_RIL_UNSOL_SIM_PLUG_OUT,
+	g_ril_register(md->ril, MTK_RIL_UNSOL_SIM_PLUG_OUT,
 			sim_removed, modem);
-	g_ril_register(ril->modem, MTK_RIL_UNSOL_SIM_PLUG_IN,
+	g_ril_register(md->ril, MTK_RIL_UNSOL_SIM_PLUG_IN,
 			sim_inserted, modem);
 }
 
@@ -533,13 +754,13 @@
 	struct cb_data *cbd = user_data;
 	ofono_modem_online_cb_t cb = cbd->cb;
 	struct ofono_modem *modem = cbd->user;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
-	struct mtk_data *ril_c;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	struct mtk_data *md_c;
 
-	mtk_0->pending_cb = NULL;
+	mtk_data_0->pending_cb = NULL;
 
 	if (message->error == RIL_E_SUCCESS) {
-		g_ril_print_response_no_args(ril->modem, message);
+		g_ril_print_response_no_args(md->ril, message);
 
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
 	} else {
@@ -548,33 +769,33 @@
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
 	}
 
-	if (ril->ofono_online)
-		ril->mtk_settings =
-			mtk_settings_create(ril->ofono_modem, ril->modem,
-						ril->has_3g);
+	if (md->ofono_online)
+		md->mtk_settings =
+			mtk_settings_create(md->modem, md->ril,
+						md->has_3g);
 	else
-		mtk_settings_remove(ril->mtk_settings);
+		mtk_settings_remove(md->mtk_settings);
 
 	/* Execute possible pending operation on the other modem */
 
-	ril_c = ril_complement(ril);
+	md_c = mtk_data_complement(md);
 
-	if (ril_c != NULL && ril_c->pending_online_cbd) {
-		struct cb_data *pending_cbd = ril_c->pending_online_cbd;
+	if (md_c != NULL && md_c->pending_online_cbd) {
+		struct cb_data *pending_cbd = md_c->pending_online_cbd;
 		ofono_modem_online_cb_t pending_cb = pending_cbd->cb;
 
-		mtk_set_online(pending_cbd->user, ril_c->pending_online,
+		mtk_set_online(pending_cbd->user, md_c->pending_online,
 				pending_cb, pending_cbd->data);
 
-		g_free(ril_c->pending_online_cbd);
-		ril_c->pending_online_cbd = NULL;
+		g_free(md_c->pending_online_cbd);
+		md_c->pending_online_cbd = NULL;
 	}
 }
 
 static int sim_state()
 {
-	int state = mtk_0->ofono_online ? SIM_1_ACTIVE : NO_SIM_ACTIVE;
-	if (mtk_1 && mtk_1->ofono_online)
+	int state = mtk_data_0->ofono_online ? SIM_1_ACTIVE : NO_SIM_ACTIVE;
+	if (mtk_data_1 && mtk_data_1->ofono_online)
 		state |= SIM_2_ACTIVE;
 
 	return state;
@@ -584,7 +805,7 @@
 {
 	struct parcel rilp;
 	struct cb_data *cbd = user_data;
-	ofono_modem_online_cb_t cb;
+	ofono_modem_online_cb_t cb = NULL;
 	GDestroyNotify notify = NULL;
 	int sim_mode;
 
@@ -593,19 +814,34 @@
 		cb = cbd->cb;
 	}
 
+	/* Case of modems with just one slot */
+	if (mtk_data_1 == NULL) {
+		mtk_data_0->pending_cb = NULL;
+
+		if (cbd != NULL) {
+			CALLBACK_WITH_SUCCESS(cb, cbd->data);
+			g_free(cbd);
+		}
+		return;
+	}
+
 	sim_mode = sim_state();
 
 	if (sim_mode == NO_SIM_ACTIVE)
 		sim_mode = MTK_SWITCH_MODE_ALL_INACTIVE;
 
-	g_mtk_request_dual_sim_mode_switch(mtk_0->modem, sim_mode, &rilp);
+	g_mtk_request_dual_sim_mode_switch(mtk_data_0->ril, sim_mode, &rilp);
 
 	/* This request is always sent through the main socket */
-	if (g_ril_send(mtk_0->modem, MTK_RIL_REQUEST_DUAL_SIM_MODE_SWITCH,
+	if (g_ril_send(mtk_data_0->ril, MTK_RIL_REQUEST_DUAL_SIM_MODE_SWITCH,
 			&rilp, func, cbd, notify) == 0 && cbd != NULL) {
 		ofono_error("%s: failure sending request", __func__);
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
-		g_free(cbd);
+		mtk_data_0->pending_cb = NULL;
+
+		if (cbd != NULL) {
+			CALLBACK_WITH_FAILURE(cb, cbd->data);
+			g_free(cbd);
+		}
 	}
 }
 
@@ -625,7 +861,7 @@
 {
 	struct cb_data *cbd = user_data;
 	struct ofono_modem *modem = cbd->user;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 	ofono_modem_online_cb_t cb = cbd->cb;
 
 	DBG("");
@@ -658,7 +894,7 @@
 	 */
 
 	if (message->error == RIL_E_SUCCESS) {
-		g_ril_print_response_no_args(ril->modem, message);
+		g_ril_print_response_no_args(md->ril, message);
 
 		if (disconnect_expected)
 			not_disconn_cb_id = g_timeout_add(T_WAIT_DISCONN_MS,
@@ -680,17 +916,17 @@
 	mtk_send_sim_mode(mtk_sim_mode_cb, cbd);
 }
 
-static void online_off_cb(struct ril_msg *message, gpointer user_data)
+static void poweroff_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	ofono_modem_online_cb_t cb = cbd->cb;
 	struct ofono_modem *modem = cbd->user;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
 	if (message->error == RIL_E_SUCCESS) {
-		g_ril_print_response_no_args(ril->modem, message);
+		g_ril_print_response_no_args(md->ril, message);
 
-		mtk_settings_remove(ril->mtk_settings);
+		mtk_settings_remove(md->mtk_settings);
 
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
 	} else {
@@ -700,10 +936,51 @@
 	}
 }
 
+static int power_on_off(GRil *ril, gboolean on, struct cb_data *cbd)
+{
+	int cancel_id;
+	int req;
+	struct parcel rilp;
+	struct parcel *p_rilp;
+	GRilResponseFunc resp;
+	GDestroyNotify notify;
+	ofono_modem_online_cb_t cb = cbd->cb;
+
+	/* Case of modems with just one slot */
+	if (mtk_data_1 == NULL) {
+		/* Fall back to generic RIL_REQUEST_RADIO_POWER */
+		req = RIL_REQUEST_RADIO_POWER;
+		g_ril_request_power(ril, on, &rilp);
+		p_rilp = &rilp;
+	} else {
+		req = on ? MTK_RIL_REQUEST_RADIO_POWERON
+			: MTK_RIL_REQUEST_RADIO_POWEROFF;
+		p_rilp = NULL;
+	}
+
+	if (on) {
+		resp = poweron_cb;
+		notify = NULL;
+	} else {
+		resp = poweroff_cb;
+		notify = g_free;
+	}
+
+	if ((cancel_id = g_ril_send(ril, req, p_rilp, resp, cbd, notify))
+			== 0) {
+		ofono_error("%s: failure sending request", __func__);
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+		g_free(cbd);
+		return 0;
+	}
+
+	return cancel_id;
+}
+
 static void mtk_set_online(struct ofono_modem *modem, ofono_bool_t online,
 				ofono_modem_online_cb_t callback, void *data)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 	struct cb_data *cbd = cb_data_new(callback, data, modem);
 	ofono_modem_online_cb_t cb = cbd->cb;
 	int current_state, next_state;
@@ -721,21 +998,21 @@
 	 * need to do this serialization, which is different from the one done
 	 * per modem by ofono core.
 	 */
-	if (mtk_0->pending_cb != NULL) {
-		ril->pending_online_cbd = cbd;
-		ril->pending_online = online;
+	if (mtk_data_0->pending_cb != NULL) {
+		md->pending_online_cbd = cbd;
+		md->pending_online = online;
 		return;
 	}
 
 	current_state = sim_state();
 
-	ril->ofono_online = online;
+	md->ofono_online = online;
 
-	/* Changes as ril points to either mtk_0 or mtk_1 global variables */
+	/* Changes as md points to either mtk_data_0 or mtk_data_1 variables */
 	next_state = sim_state();
 
-	DBG("setting mtk_%d->ofono_online to: %d (from %d to %d)",
-		ril->slot, online, current_state, next_state);
+	DBG("setting md_%d->ofono_online to: %d (from %d to %d)",
+		md->slot, online, current_state, next_state);
 
 	if (current_state == next_state) {
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
@@ -745,28 +1022,18 @@
 
 	/* Reset mtk_data variables */
 	if (online == FALSE)
-		ril->sim_status_retries = 0;
+		md->sim_status_retries = 0;
 
 	if (current_state == NO_SIM_ACTIVE) {
 		/* Old state was off, need to power on the modem */
-		if (g_ril_send(mtk_0->modem, MTK_RIL_REQUEST_RADIO_POWERON,
-				NULL, poweron_cb, cbd, NULL) == 0) {
-			CALLBACK_WITH_FAILURE(cb, cbd->data);
-			g_free(cbd);
-		} else {
+		if (power_on_off(mtk_data_0->ril, TRUE, cbd)) {
 			/* Socket might disconnect... failsafe */
-			mtk_0->pending_cb = poweron_disconnect;
-			mtk_0->pending_cbd = cbd;
+			mtk_data_0->pending_cb = poweron_disconnect;
+			mtk_data_0->pending_cbd = cbd;
 		}
 	} else if (next_state == NO_SIM_ACTIVE) {
-		if (g_ril_send(mtk_0->modem, MTK_RIL_REQUEST_RADIO_POWEROFF,
-				NULL, online_off_cb, cbd, g_free) == 0) {
-			ofono_error("%s: failure sending request", __func__);
-			CALLBACK_WITH_FAILURE(cb, cbd->data);
-			g_free(cbd);
-		} else {
+		if (power_on_off(mtk_data_0->ril, FALSE, cbd))
 			disconnect_expected = TRUE;
-		}
 	} else {
 		mtk_send_sim_mode(mtk_sim_mode_cb, cbd);
 	}
@@ -774,97 +1041,98 @@
 
 static void set_online_cb(const struct ofono_error *error, void *data)
 {
-	if (mtk_1->ofono_online_target && !mtk_1->ofono_online)
-		mtk_set_online(mtk_1->ofono_modem, TRUE, set_online_cb, NULL);
+	if (mtk_data_1->ofono_online_target && !mtk_data_1->ofono_online)
+		mtk_set_online(mtk_data_1->modem, TRUE, set_online_cb, NULL);
 }
 
 static void set_offline_cb(const struct ofono_error *error, void *data)
 {
-	if (mtk_1->ofono_online)
-		mtk_set_online(mtk_1->ofono_modem, FALSE, set_offline_cb, NULL);
-	else if (mtk_0->ofono_online_target)
-		mtk_set_online(mtk_0->ofono_modem, TRUE, set_online_cb, NULL);
+	if (mtk_data_1->ofono_online)
+		mtk_set_online(mtk_data_1->modem, FALSE, set_offline_cb, NULL);
+	else if (mtk_data_0->ofono_online_target)
+		mtk_set_online(mtk_data_0->modem, TRUE, set_online_cb, NULL);
 	else
-		mtk_set_online(mtk_1->ofono_modem, TRUE, set_online_cb, NULL);
+		mtk_set_online(mtk_data_1->modem, TRUE, set_online_cb, NULL);
 }
 
 void mtk_reset_all_modems(void)
 {
-	if (!mtk_0->ofono_online && !mtk_1->ofono_online)
+	if (!mtk_data_0->ofono_online && !mtk_data_1->ofono_online)
 		return;
 
-	mtk_0->ofono_online_target = mtk_0->ofono_online;
-	mtk_1->ofono_online_target = mtk_1->ofono_online;
-
-	ofono_modem_set_powered(mtk_0->ofono_modem, FALSE);
-	ofono_modem_set_powered(mtk_1->ofono_modem, FALSE);
-
-	if (mtk_0->ofono_online)
-		mtk_set_online(mtk_0->ofono_modem, FALSE, set_offline_cb, NULL);
+	mtk_data_0->ofono_online_target = mtk_data_0->ofono_online;
+	mtk_data_1->ofono_online_target = mtk_data_1->ofono_online;
+
+	ofono_modem_set_powered(mtk_data_0->modem, FALSE);
+	ofono_modem_set_powered(mtk_data_1->modem, FALSE);
+
+	if (mtk_data_0->ofono_online)
+		mtk_set_online(mtk_data_0->modem, FALSE, set_offline_cb, NULL);
 	else
-		mtk_set_online(mtk_1->ofono_modem, FALSE, set_offline_cb, NULL);
+		mtk_set_online(mtk_data_1->modem, FALSE, set_offline_cb, NULL);
 }
 
 static void create_atoms_on_connection(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	struct ril_voicecall_driver_data vc_data = { md->ril, modem };
 
-	ril->devinfo = ofono_devinfo_create(modem, OFONO_RIL_VENDOR_MTK,
-						RILMODEM, ril->modem);
+	md->devinfo = ofono_devinfo_create(modem, OFONO_RIL_VENDOR_MTK,
+						RILMODEM, md->ril);
 
 	/* 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);
+	md->voicecall = ofono_voicecall_create(modem, OFONO_RIL_VENDOR_MTK,
+						MTKMODEM, &vc_data);
+	md->callvolume = ofono_call_volume_create(modem, OFONO_RIL_VENDOR_MTK,
+							RILMODEM, md->ril);
 }
 
 static void remove_atoms_on_disconnection(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
 	if (__ofono_modem_find_atom(modem, OFONO_ATOM_TYPES_CALL_VOLUME))
-		ofono_call_volume_remove(ril->callvolume);
-	ril->callvolume = NULL;
+		ofono_call_volume_remove(md->callvolume);
+	md->callvolume = NULL;
 	if (__ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_VOICECALL))
-		ofono_voicecall_remove(ril->voicecall);
-	ril->voicecall = NULL;
+		ofono_voicecall_remove(md->voicecall);
+	md->voicecall = NULL;
 	if (__ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_DEVINFO))
-		ofono_devinfo_remove(ril->devinfo);
-	ril->devinfo = NULL;
+		ofono_devinfo_remove(md->devinfo);
+	md->devinfo = NULL;
 }
 
-static void start_slot(struct mtk_data *ril, struct socket_data *sock,
+static void start_slot(struct mtk_data *md, struct socket_data *sock,
 			const char *hex_prefix)
 {
-	ofono_info("Physical slot %d in socket %s", ril->slot, sock->path);
-
-	ril->modem = sock->gril;
-	ril->radio_state = sock->radio_state;
-
-	g_ril_set_slot(ril->modem, ril->slot);
+	ofono_info("Physical slot %d in socket %s", md->slot, sock->path);
+
+	md->ril = sock->ril;
+	md->radio_state = sock->radio_state;
+
+	g_ril_set_slot(md->ril, md->slot);
 
 	if (getenv("OFONO_RIL_TRACE"))
-		g_ril_set_trace(ril->modem, TRUE);
+		g_ril_set_trace(md->ril, TRUE);
 
 	if (getenv("OFONO_RIL_HEX_TRACE"))
-		g_ril_set_debugf(ril->modem, mtk_debug, (char *) hex_prefix);
-
-	g_ril_set_disconnect_function(ril->modem, socket_disconnected,
-					ril->ofono_modem);
-
-	g_ril_unregister(sock->gril, sock->radio_state_ev_id);
-
-	g_ril_register(ril->modem, RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED,
-			mtk_radio_state_changed, ril->ofono_modem);
-
-	mtk_connected(ril->ofono_modem);
+		g_ril_set_debugf(md->ril, mtk_debug, (char *) hex_prefix);
+
+	g_ril_set_disconnect_function(md->ril, socket_disconnected,
+					md->modem);
+
+	g_ril_unregister(sock->ril, sock->radio_state_ev_id);
+
+	g_ril_register(md->ril, RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED,
+			mtk_radio_state_changed, md->modem);
+
+	mtk_connected(md->modem);
 }
 
 static void query_3g_caps_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct socket_data *sock = user_data;
-	struct socket_data *sock_for_mtk_0, *sock_for_mtk_1;
+	struct socket_data *sock_for_md_0, *sock_for_md_1;
 	int slot_3g;
 
 	if (message->error != RIL_E_SUCCESS) {
@@ -873,7 +1141,7 @@
 		return;
 	}
 
-	slot_3g = g_mtk_reply_parse_get_3g_capability(sock->gril, message);
+	slot_3g = g_mtk_reply_parse_get_3g_capability(sock->ril, message);
 
 	/*
 	 * The socket at sock_slot_0 always connects to the slot with 3G
@@ -883,23 +1151,23 @@
 	 * to different physical slots depending on the current configuration.
 	 * We want to keep the relationship between the physical slots and
 	 * the modem names in DBus (so /ril_0 and /ril_1 always refer to the
-	 * same physical slots), so here we assign the sockets needed by mtk_0
-	 * and mtk_1 structures to make sure that happens.
+	 * same physical slots), so here we assign the sockets needed by
+	 * mtk_data_0 and mtk_data_1 structures to make sure that happens.
 	 */
 	if (slot_3g == MULTISIM_SLOT_0) {
-		sock_for_mtk_0 = sock_0;
-		sock_for_mtk_1 = sock_1;
-		mtk_0->has_3g = TRUE;
-		mtk_1->has_3g = FALSE;
+		sock_for_md_0 = sock_0;
+		sock_for_md_1 = sock_1;
+		mtk_data_0->has_3g = TRUE;
+		mtk_data_1->has_3g = FALSE;
 	} else {
-		sock_for_mtk_0 = sock_1;
-		sock_for_mtk_1 = sock_0;
-		mtk_0->has_3g = FALSE;
-		mtk_1->has_3g = TRUE;
+		sock_for_md_0 = sock_1;
+		sock_for_md_1 = sock_0;
+		mtk_data_0->has_3g = FALSE;
+		mtk_data_1->has_3g = TRUE;
 	}
 
-	start_slot(mtk_0, sock_for_mtk_0, hex_slot_0);
-	start_slot(mtk_1, sock_for_mtk_1, hex_slot_1);
+	start_slot(mtk_data_0, sock_for_md_0, hex_slot_0);
+	start_slot(mtk_data_1, sock_for_md_1, hex_slot_1);
 
 	g_free(sock_0);
 	sock_0 = NULL;
@@ -909,7 +1177,7 @@
 
 static void query_3g_caps(struct socket_data *sock)
 {
-	if (g_ril_send(sock->gril, MTK_RIL_REQUEST_GET_3G_CAPABILITY, NULL,
+	if (g_ril_send(sock->ril, MTK_RIL_REQUEST_GET_3G_CAPABILITY, NULL,
 			query_3g_caps_cb, sock, NULL) <= 0)
 		ofono_error("%s Error querying 3G capabilities", __func__);
 }
@@ -917,9 +1185,9 @@
 static gboolean mtk_connected(gpointer user_data)
 {
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
-	ofono_info("[slot %d] CONNECTED", ril->slot);
+	ofono_info("[slot %d] CONNECTED", md->slot);
 
 	DBG("calling set_powered(TRUE)");
 
@@ -928,8 +1196,8 @@
 
 	create_atoms_on_connection(modem);
 
-	if (ril->pending_cb)
-		ril->pending_cb(ril->pending_cbd);
+	if (md->pending_cb)
+		md->pending_cb(md->pending_cbd);
 
 	/* Call the function just once */
 	return FALSE;
@@ -938,9 +1206,9 @@
 static gboolean reconnect_rild(gpointer user_data)
 {
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
-	ofono_info("[slot %d] trying to reconnect", ril->slot);
+	ofono_info("[slot %d] trying to reconnect", md->slot);
 
 	if (create_gril(modem) < 0)
 		return TRUE;
@@ -954,15 +1222,15 @@
 static void socket_disconnected(gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
-	DBG("slot %d", ril->slot);
+	DBG("slot %d", md->slot);
 
 	/* Atoms use old gril object, remove and recreate later */
 	remove_atoms_on_disconnection(modem);
 
-	g_ril_unref(ril->modem);
-	ril->modem = NULL;
+	g_ril_unref(md->ril);
+	md->ril = NULL;
 
 	/* Disconnection happened so we do not call failsafe function */
 	if (not_disconn_cb_id != 0) {
@@ -979,13 +1247,13 @@
 
 static int create_gril(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 	struct socket_data *sock;
 	int sock_num;
 
-	DBG("slot %d", ril->slot);
+	DBG("slot %d", md->slot);
 
-	if (ril->modem != NULL)
+	if (md->ril != NULL)
 		return 0;
 
 	sock = g_try_malloc0(sizeof(*sock));
@@ -994,7 +1262,7 @@
 		return -ENOMEM;
 	}
 
-	if (ril->slot == MULTISIM_SLOT_0) {
+	if (md->slot == MULTISIM_SLOT_0) {
 		sock_num = SOCKET_NUM_FOR_DBG_0;
 		sock->path = sock_slot_0;
 	} else {
@@ -1003,7 +1271,7 @@
 	}
 
 	/* Opens the socket to RIL */
-	sock->gril = g_ril_new(sock->path, OFONO_RIL_VENDOR_MTK);
+	sock->ril = g_ril_new(sock->path, OFONO_RIL_VENDOR_MTK);
 
 	/*
 	 * NOTE: Since AT modems open a tty, and then call
@@ -1014,11 +1282,11 @@
 	 * abstraction... ( probaby not a bad idea ).
 	 */
 
-	if (sock->gril == NULL) {
+	if (sock->ril == NULL) {
 		ofono_error("g_ril_new() failed to connect to %s!", sock->path);
 		g_free(sock);
 		return -EIO;
-	} else if (ril->slot == MULTISIM_SLOT_0) {
+	} else if (md->slot == MULTISIM_SLOT_0) {
 		sock_0 = sock;
 	} else {
 		sock_1 = sock;
@@ -1026,22 +1294,25 @@
 
 	sock->radio_state = RADIO_STATE_UNAVAILABLE;
 	sock->radio_state_ev_id =
-		g_ril_register(sock->gril,
+		g_ril_register(sock->ril,
 				RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED,
 				radio_state_changed, sock);
 
+	g_ril_register(sock->ril, MTK_RIL_UNSOL_RESPONSE_REGISTRATION_SUSPENDED,
+			reg_suspended, modem);
+
 	/* sock_num is negative to avoid confusion with physical slots */
-	g_ril_set_slot(sock->gril, sock_num);
+	g_ril_set_slot(sock->ril, sock_num);
 
-	g_ril_set_vendor_print_msg_id_funcs(sock->gril,
+	g_ril_set_vendor_print_msg_id_funcs(sock->ril,
 						mtk_request_id_to_string,
 						mtk_unsol_request_to_string);
 
 	if (getenv("OFONO_RIL_TRACE"))
-		g_ril_set_trace(sock->gril, TRUE);
+		g_ril_set_trace(sock->ril, TRUE);
 
 	if (getenv("OFONO_RIL_HEX_TRACE"))
-		g_ril_set_debugf(sock->gril, mtk_debug, (char *) sock->path);
+		g_ril_set_debugf(sock->ril, mtk_debug, (char *) sock->path);
 
 	return 0;
 }
@@ -1049,11 +1320,11 @@
 static gboolean connect_rild(gpointer user_data)
 {
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
-
-	ofono_info("Trying to reconnect to slot %d...", ril->slot);
-
-	if (ril->rild_connect_retries++ < RILD_MAX_CONNECT_RETRIES) {
+	struct mtk_data *md = ofono_modem_get_data(modem);
+
+	ofono_info("Trying to reconnect to slot %d...", md->slot);
+
+	if (md->rild_connect_retries++ < RILD_MAX_CONNECT_RETRIES) {
 		if (create_gril(modem) < 0)
 			return TRUE;
 	} else {
@@ -1086,17 +1357,17 @@
 
 static int mtk_disable(struct ofono_modem *modem)
 {
-	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *md = ofono_modem_get_data(modem);
 
 	DBG("%p", modem);
 
-	if (ril->slot == MULTISIM_SLOT_0 && not_disconn_cb_id != 0) {
+	if (md->slot == MULTISIM_SLOT_0 && not_disconn_cb_id != 0) {
 		g_source_remove(not_disconn_cb_id);
 		not_disconn_cb_id = 0;
 	}
 
-	if (ril->ofono_online) {
-		ril->ofono_online = FALSE;
+	if (md->ofono_online) {
+		md->ofono_online = FALSE;
 		mtk_send_sim_mode(NULL, NULL);
 	}
 

=== modified file 'plugins/ril.c'
--- plugins/ril.c	2014-11-20 00:03:31 +0000
+++ plugins/ril.c	2015-02-04 00:09:49 +0000
@@ -73,7 +73,7 @@
 #define RILD_CMD_SOCKET "/dev/socket/rild"
 
 struct ril_data {
-	GRil *modem;
+	GRil *ril;
 	enum ofono_ril_vendor vendor;
 	int sim_status_retries;
 	ofono_bool_t connected;
@@ -94,27 +94,29 @@
 static void ril_radio_state_changed(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
-	struct ril_data *ril = ofono_modem_get_data(modem);
-	int radio_state = g_ril_unsol_parse_radio_state_changed(ril->modem,
+	struct ril_data *rd = ofono_modem_get_data(modem);
+	int radio_state = g_ril_unsol_parse_radio_state_changed(rd->ril,
 								message);
 
-	if (radio_state != ril->radio_state) {
+	if (radio_state != rd->radio_state) {
 
-		ofono_info("%s: state: %s ril->ofono_online: %d",
+		ofono_info("%s: state: %s rd->ofono_online: %d",
 				__func__,
 				ril_radio_state_to_string(radio_state),
-				ril->ofono_online);
+				rd->ofono_online);
 
-		ril->radio_state = radio_state;
+		rd->radio_state = radio_state;
 
 		switch (radio_state) {
 		case RADIO_STATE_ON:
 
-			if (ril->radio_settings == NULL)
-				ril->radio_settings =
+			if (rd->radio_settings == NULL) {
+				struct ril_radio_settings_driver_data rs_data =
+							{ rd->ril, modem };
+				rd->radio_settings =
 					ofono_radio_settings_create(modem,
-						ril->vendor, RILMODEM,
-						ril->modem);
+						rd->vendor, RILMODEM, &rs_data);
+			}
 
 			break;
 
@@ -125,7 +127,7 @@
 			 * If radio powers off asychronously, then
 			 * assert, and let upstart re-start the stack.
 			 */
-			if (ril->ofono_online) {
+			if (rd->ofono_online) {
 				ofono_error("%s: radio self-powered off!",
 						__func__);
 				g_assert(FALSE);
@@ -140,24 +142,28 @@
 
 int ril_create(struct ofono_modem *modem, enum ofono_ril_vendor vendor)
 {
-	struct ril_data *ril = g_try_new0(struct ril_data, 1);
-	if (ril == NULL) {
+	ofono_bool_t lte_cap;
+	struct ril_data *rd = g_try_new0(struct ril_data, 1);
+	if (rd == NULL) {
 		errno = ENOMEM;
 		goto error;
 	}
 
 	DBG("");
 
-	ril->vendor = vendor;
-	ril->ofono_online = FALSE;
-	ril->radio_state = RADIO_STATE_OFF;
-
-	ofono_modem_set_data(modem, ril);
+	rd->vendor = vendor;
+	rd->ofono_online = FALSE;
+	rd->radio_state = RADIO_STATE_OFF;
+
+	lte_cap = getenv("OFONO_RIL_RAT_LTE") ? TRUE : FALSE;
+	ofono_modem_set_boolean(modem, MODEM_PROP_LTE_CAPABLE, lte_cap);
+
+	ofono_modem_set_data(modem, rd);
 
 	return 0;
 
 error:
-	g_free(ril);
+	g_free(rd);
 
 	return -errno;
 }
@@ -169,57 +175,59 @@
 
 void ril_remove(struct ofono_modem *modem)
 {
-	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct ril_data *rd = ofono_modem_get_data(modem);
 
 	ofono_modem_set_data(modem, NULL);
 
-	if (!ril)
+	if (!rd)
 		return;
 
-	g_ril_unref(ril->modem);
+	g_ril_unref(rd->ril);
 
-	g_free(ril);
+	g_free(rd);
 }
 
 void ril_pre_sim(struct ofono_modem *modem)
 {
-	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct ril_data *rd = ofono_modem_get_data(modem);
+	struct ril_voicecall_driver_data vc_data = { rd->ril, modem };
 	struct ril_sim_data sim_data;
 
 	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);
+	ofono_devinfo_create(modem, rd->vendor, RILMODEM, rd->ril);
+	ofono_voicecall_create(modem, rd->vendor, RILMODEM, &vc_data);
+	ofono_call_volume_create(modem, rd->vendor, RILMODEM, rd->ril);
 
-	sim_data.gril = ril->modem;
+	sim_data.gril = rd->ril;
 	sim_data.modem = modem;
 	sim_data.ril_state_watch = NULL;
 
-	ril->sim = ofono_sim_create(modem, ril->vendor, RILMODEM, &sim_data);
-	g_assert(ril->sim != NULL);
+	rd->sim = ofono_sim_create(modem, rd->vendor, RILMODEM, &sim_data);
+	g_assert(rd->sim != NULL);
 }
 
 void ril_post_sim(struct ofono_modem *modem)
 {
-	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct ril_data *rd = ofono_modem_get_data(modem);
 	struct ofono_gprs *gprs;
 	struct ofono_gprs_context *gc;
 	struct ofono_message_waiting *mw;
+	struct ril_gprs_driver_data gprs_data = { rd->ril, modem };
 	struct ril_gprs_context_data inet_ctx =
-			{ ril->modem, OFONO_GPRS_CONTEXT_TYPE_INTERNET };
+			{ rd->ril, OFONO_GPRS_CONTEXT_TYPE_INTERNET };
 	struct ril_gprs_context_data mms_ctx =
-			{ ril->modem, OFONO_GPRS_CONTEXT_TYPE_MMS };
+			{ rd->ril, OFONO_GPRS_CONTEXT_TYPE_MMS };
 
 	/* TODO: this function should setup:
 	 *  - phonebook
 	 *  - stk ( SIM toolkit )
 	 *  - radio_settings
 	 */
-	ofono_sms_create(modem, ril->vendor, RILMODEM, ril->modem);
+	ofono_sms_create(modem, rd->vendor, RILMODEM, rd->ril);
 
-	gprs = ofono_gprs_create(modem, ril->vendor, RILMODEM, ril->modem);
-	gc = ofono_gprs_context_create(modem, ril->vendor, RILMODEM, &inet_ctx);
+	gprs = ofono_gprs_create(modem, rd->vendor, RILMODEM, &gprs_data);
+	gc = ofono_gprs_context_create(modem, rd->vendor, RILMODEM, &inet_ctx);
 
 	if (gc) {
 		ofono_gprs_context_set_type(gc,
@@ -227,7 +235,7 @@
 		ofono_gprs_add_context(gprs, gc);
 	}
 
-	gc = ofono_gprs_context_create(modem, ril->vendor, RILMODEM, &mms_ctx);
+	gc = ofono_gprs_context_create(modem, rd->vendor, RILMODEM, &mms_ctx);
 
 	if (gc) {
 		ofono_gprs_context_set_type(gc,
@@ -239,39 +247,39 @@
 	if (mw)
 		ofono_message_waiting_register(mw);
 
-	ofono_call_forwarding_create(modem, ril->vendor, RILMODEM, ril->modem);
+	ofono_call_forwarding_create(modem, rd->vendor, RILMODEM, rd->ril);
 
-	ofono_phonebook_create(modem, ril->vendor, RILMODEM, modem);
+	ofono_phonebook_create(modem, rd->vendor, RILMODEM, modem);
 }
 
 void ril_post_online(struct ofono_modem *modem)
 {
-	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct ril_data *rd = ofono_modem_get_data(modem);
 
-	ofono_netreg_create(modem, ril->vendor, RILMODEM, ril->modem);
-	ofono_ussd_create(modem, ril->vendor, RILMODEM, ril->modem);
-	ofono_call_settings_create(modem, ril->vendor, RILMODEM, ril->modem);
-	ofono_call_barring_create(modem, ril->vendor, RILMODEM, ril->modem);
+	ofono_netreg_create(modem, rd->vendor, RILMODEM, rd->ril);
+	ofono_ussd_create(modem, rd->vendor, RILMODEM, rd->ril);
+	ofono_call_settings_create(modem, rd->vendor, RILMODEM, rd->ril);
+	ofono_call_barring_create(modem, rd->vendor, RILMODEM, rd->ril);
 }
 
 static void ril_set_online_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
-	struct ril_data *ril = cbd->user;
+	struct ril_data *rd = cbd->user;
 	ofono_modem_online_cb_t cb = cbd->cb;
 
 	if (message->error == RIL_E_SUCCESS) {
-		DBG("%s: set_online OK: ril->ofono_online: %d", __func__,
-			ril->ofono_online);
+		DBG("%s: set_online OK: rd->ofono_online: %d", __func__,
+			rd->ofono_online);
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
 	} else {
 		ofono_error("%s: set_online: %d failed", __func__,
-				ril->ofono_online);
+				rd->ofono_online);
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
 	}
 }
 
-static void ril_send_power(struct ril_data *ril, ofono_bool_t online,
+static void ril_send_power(struct ril_data *rd, ofono_bool_t online,
 				GRilResponseFunc func,
 				gpointer user_data)
 {
@@ -287,9 +295,9 @@
 
 	DBG("(online = 1, offline = 0)): %i", online);
 
-	g_ril_request_power(ril->modem, (const gboolean) online, &rilp);
+	g_ril_request_power(rd->ril, (const gboolean) online, &rilp);
 
-	if (g_ril_send(ril->modem, RIL_REQUEST_RADIO_POWER, &rilp,
+	if (g_ril_send(rd->ril, RIL_REQUEST_RADIO_POWER, &rilp,
 			func, cbd, notify) == 0 && cbd != NULL) {
 
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
@@ -300,26 +308,26 @@
 void ril_set_online(struct ofono_modem *modem, ofono_bool_t online,
 			ofono_modem_online_cb_t callback, void *data)
 {
-	struct ril_data *ril = ofono_modem_get_data(modem);
-	struct cb_data *cbd = cb_data_new(callback, data, ril);
-
-	ril->ofono_online = online;
-
-	DBG("setting ril->ofono_online to: %d", online);
-
-	ril_send_power(ril, online, ril_set_online_cb, cbd);
+	struct ril_data *rd = ofono_modem_get_data(modem);
+	struct cb_data *cbd = cb_data_new(callback, data, rd);
+
+	rd->ofono_online = online;
+
+	DBG("setting rd->ofono_online to: %d", online);
+
+	ril_send_power(rd, online, ril_set_online_cb, cbd);
 }
 
 static void ril_connected(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
-	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct ril_data *rd = ofono_modem_get_data(modem);
 
-	ofono_info("[%d,UNSOL]< %s", g_ril_get_slot(ril->modem),
-		g_ril_unsol_request_to_string(ril->modem, message->req));
+	ofono_info("[%d,UNSOL]< %s", g_ril_get_slot(rd->ril),
+		g_ril_unsol_request_to_string(rd->ril, message->req));
 
 	/* TODO: need a disconnect function to restart things! */
-	ril->connected = TRUE;
+	rd->connected = TRUE;
 
 	DBG("calling set_powered(TRUE)");
 
@@ -328,9 +336,9 @@
 
 static int create_gril(struct ofono_modem *modem)
 {
-	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct ril_data *rd = ofono_modem_get_data(modem);
 
-	ril->modem = g_ril_new(RILD_CMD_SOCKET, OFONO_RIL_VENDOR_AOSP);
+	rd->ril = g_ril_new(RILD_CMD_SOCKET, OFONO_RIL_VENDOR_AOSP);
 
 	/* NOTE: Since AT modems open a tty, and then call
 	 * g_at_chat_new(), they're able to return -EIO if
@@ -340,21 +348,21 @@
 	 * abstraction... ( probaby not a bad idea ).
 	 */
 
-	if (ril->modem == NULL) {
+	if (rd->ril == NULL) {
 		ofono_error("g_ril_new() failed to create modem!");
 		return -EIO;
 	}
 
 	if (getenv("OFONO_RIL_TRACE"))
-		g_ril_set_trace(ril->modem, TRUE);
+		g_ril_set_trace(rd->ril, TRUE);
 
 	if (getenv("OFONO_RIL_HEX_TRACE"))
-		g_ril_set_debugf(ril->modem, ril_debug, "Device: ");
+		g_ril_set_debugf(rd->ril, ril_debug, "Device: ");
 
-	g_ril_register(ril->modem, RIL_UNSOL_RIL_CONNECTED,
+	g_ril_register(rd->ril, RIL_UNSOL_RIL_CONNECTED,
 			ril_connected, modem);
 
-	g_ril_register(ril->modem, RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED,
+	g_ril_register(rd->ril, RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED,
 			ril_radio_state_changed, modem);
 
 	return 0;
@@ -363,11 +371,11 @@
 static gboolean connect_rild(gpointer user_data)
 {
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
-	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct ril_data *rd = ofono_modem_get_data(modem);
 
 	ofono_info("Trying to reconnect to rild...");
 
-	if (ril->rild_connect_retries++ < RILD_MAX_CONNECT_RETRIES) {
+	if (rd->rild_connect_retries++ < RILD_MAX_CONNECT_RETRIES) {
 		if (create_gril(modem) < 0)
 			return TRUE;
 	} else {
@@ -394,11 +402,11 @@
 
 int ril_disable(struct ofono_modem *modem)
 {
-	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct ril_data *rd = ofono_modem_get_data(modem);
 
 	DBG("%p", modem);
 
-	ril_send_power(ril, FALSE, NULL, NULL);
+	ril_send_power(rd, FALSE, NULL, NULL);
 
 	return 0;
 }

=== modified file 'src/gprs.c'
--- src/gprs.c	2014-09-04 21:39:42 +0000
+++ src/gprs.c	2015-02-04 00:09:49 +0000
@@ -157,6 +157,8 @@
 		return "WAP";
 	case OFONO_GPRS_CONTEXT_TYPE_IMS:
 		return "IMS";
+	case OFONO_GPRS_CONTEXT_TYPE_IA:
+		return "IA";
 	}
 
 	return NULL;
@@ -176,6 +178,8 @@
 		return "wap";
 	case OFONO_GPRS_CONTEXT_TYPE_IMS:
 		return "ims";
+	case OFONO_GPRS_CONTEXT_TYPE_IA:
+		return "ia";
 	}
 
 	return NULL;
@@ -196,6 +200,9 @@
 	} else if (g_str_equal(str, "ims")) {
 		*out = OFONO_GPRS_CONTEXT_TYPE_IMS;
 		return TRUE;
+	} else if (g_str_equal(str, "ia")) {
+		*out = OFONO_GPRS_CONTEXT_TYPE_IA;
+		return TRUE;
 	}
 
 	return FALSE;
@@ -1232,8 +1239,9 @@
 	}
 
 	if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_ANY ||
-		ctx->type == OFONO_GPRS_CONTEXT_TYPE_WAP ||
-		ctx->type == OFONO_GPRS_CONTEXT_TYPE_IMS)
+			ctx->type == OFONO_GPRS_CONTEXT_TYPE_WAP ||
+			ctx->type == OFONO_GPRS_CONTEXT_TYPE_IMS ||
+			ctx->type == OFONO_GPRS_CONTEXT_TYPE_IA)
 		return __ofono_error_invalid_args(msg);
 
 	if (!strcmp(property, "MessageProxy")) {
@@ -2973,6 +2981,50 @@
 	__ofono_gprs_provision_free_settings(settings, count);
 }
 
+static struct pri_context *gprs_context_for_ia(struct ofono_gprs *gprs)
+{
+	GSList *l;
+
+	for (l = gprs->contexts; l; l = l->next) {
+		struct pri_context *ctx = l->data;
+
+		if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_IA)
+			return ctx;
+	}
+
+	for (l = gprs->contexts; l; l = l->next) {
+		struct pri_context *ctx = l->data;
+
+		if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET)
+			return ctx;
+	}
+
+	return gprs->contexts->data;
+}
+
+static void set_ia_apn_cb(const struct ofono_error *error, void *data)
+{
+	if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
+		ofono_error("Could not set IA APN");
+}
+
+static void set_ia_apn(struct ofono_gprs *gprs)
+{
+	struct pri_context *ctx = gprs_context_for_ia(gprs);
+	struct ofono_gprs_primary_context *ofono_ctx = &ctx->context;
+	char mccmnc[OFONO_MAX_MCC_LENGTH + OFONO_MAX_MNC_LENGTH + 1];
+	const char *mcc = ofono_sim_get_mcc(gprs->sim);
+	const char *mnc = ofono_sim_get_mnc(gprs->sim);
+
+	strcpy(mccmnc, mcc);
+	strcpy(mccmnc + strlen(mcc), mnc);
+
+	gprs->driver->set_ia_apn(gprs, ofono_ctx->apn, ofono_ctx->proto,
+					ofono_ctx->username,
+					ofono_ctx->password, mccmnc,
+					set_ia_apn_cb, gprs);
+}
+
 static void ofono_gprs_finish_register(struct ofono_gprs *gprs)
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
@@ -2982,6 +3034,9 @@
 	if (gprs->contexts == NULL) /* Automatic provisioning failed */
 		add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET);
 
+	if (gprs->driver->set_ia_apn)
+		set_ia_apn(gprs);
+
 	if (!g_dbus_register_interface(conn, path,
 					OFONO_CONNECTION_MANAGER_INTERFACE,
 					manager_methods, manager_signals, NULL,

=== modified file 'src/modem.c'
--- src/modem.c	2014-09-16 08:02:58 +0000
+++ src/modem.c	2015-02-04 00:09:49 +0000
@@ -1664,7 +1664,8 @@
 	DBG("modem %p property %s", modem, name);
 
 	if (type != PROPERTY_TYPE_STRING &&
-			type != PROPERTY_TYPE_INTEGER)
+			type != PROPERTY_TYPE_INTEGER &&
+			type != PROPERTY_TYPE_BOOLEAN)
 		return -EINVAL;
 
 	property = g_try_new0(struct modem_property, 1);

=== added directory 'test/rilmodem/sim'
=== added file 'test/rilmodem/sim/simtestutil.py'
--- test/rilmodem/sim/simtestutil.py	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/simtestutil.py	2015-02-04 00:09:49 +0000
@@ -0,0 +1,391 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""SIM Test utility functions.
+
+This module contains functions used by the SIM functional test scripts.
+
+ToDo:
+ * Add check for optional SimManager 'PreferredLanguage' property
+"""
+
+import argparse
+import dbus
+import subprocess
+import sys
+import unittest
+
+emergency_numbers = ["08", "000", "999", "110", "112", "911", "118", "119"]
+
+# Note - rilmodem doesn't remove 'rat' when modem is offlined;
+# as this is different behavior than when booted offline, "rat"
+# is not present in either of the following offline lists
+
+no_sim_offline_features = [ "sim" ]
+sim_offline_features = [ "sim", "gprs", "sms" ]
+
+no_sim_online_features = [ "rat", "sim" ]
+sim_online_features = [ "gprs", "ussd", "net", "sms", "rat", "sim" ]
+
+no_sim_offline_ifaces = [ "org.ofono.CallVolume",
+			"org.ofono.VoiceCallManager" ]
+
+# LP: #1399756;  RadioSettings isn't properly removed from
+# 'Interfaces' ( and correspondingly "rat" from 'Features' )
+# when rilmodem is set offline.  Neither are present if the
+# device boots with modems offline. That's why it's not
+# included in this list.
+sim_offline_ifaces = [ "org.ofono.ConnectionManager",
+			"org.ofono.Phonebook",
+			"org.ofono.CallForwarding",
+			"org.ofono.SmartMessaging",
+			"org.ofono.PushNotification",
+			"org.ofono.MessageManager",
+			"org.ofono.NetworkTime",
+			"org.ofono.MessageWaiting",
+			"org.ofono.SimManager",
+			"org.ofono.CallVolume",
+			"org.ofono.VoiceCallManager" ]
+
+no_sim_online_ifaces = [ "org.ofono.RadioSettings",
+			"org.ofono.SimManager",
+			"org.ofono.CallVolume",
+			"org.ofono.VoiceCallManager" ]
+
+sim_online_ifaces = [ "org.ofono.ConnectionManager",
+			"org.ofono.CallBarring",
+			"org.ofono.CallSettings",
+			"org.ofono.SupplementaryServices",
+			"org.ofono.NetworkRegistration",
+			"org.ofono.Phonebook",
+			"org.ofono.CallForwarding",
+			"org.ofono.SmartMessaging",
+			"org.ofono.PushNotification",
+			"org.ofono.MessageManager",
+			"org.ofono.NetworkTime",
+			"org.ofono.MessageWaiting",
+			"org.ofono.RadioSettings",
+			"org.ofono.SimManager",
+			"org.ofono.CallVolume",
+			"org.ofono.VoiceCallManager" ]
+
+modem_properties = [ "Revision", "Serial", "Model",
+		"Features", "Online", "Type",
+		"Interfaces", "Emergency", "Manufacturer",
+		"Powered", "Lockdown" ]
+
+sim_properties = [ "Present", "FixedDialing", "BarredDialing",
+			"SubscriberNumbers", "LockedPins",
+			"PinRequired", "Retries" ]
+
+def get_product():
+	product_bytes = subprocess.check_output(["getprop", "ro.build.product"])
+	return product_bytes.decode('utf-8').strip('\n')
+
+def sim_unittest_main(args):
+
+	if args.debug:
+		print(args)
+		print(sys.argv[0])
+
+	if len(args.unittest_args) == 0:
+		args.unittest_args.append("sys.argv[0]")
+		unittest.main(argv=args.unittest_args)
+	else:
+		unittest.main()
+
+def parse_args(parser=None):
+
+	if parser is None:
+		parser = argparse.ArgumentParser()
+
+	parser.add_argument("-d",
+			"--debug",
+			dest="debug",
+			action="store_true",
+			help="""Enables debug verbosity""",
+			)
+
+	parser.add_argument("-m",
+			"--modem",
+			dest="modem",
+			action="store",
+			help="""Specifies modem path""",
+			)
+
+	parser.add_argument("unittest_args", nargs="*")
+
+	parser.set_defaults(modem="")
+
+	args = parser.parse_args()
+
+	return args
+
+def parse_lock_test_args():
+
+	parser = argparse.ArgumentParser()
+
+	group = parser.add_mutually_exclusive_group(required=True)
+
+	group.add_argument("--pin",
+				dest="pin",
+				help="""Specify the SIM PIN code""",
+				metavar="<PIN Code>",
+				)
+
+	group.add_argument("--continue",
+				dest="cont",
+				action="store_true",
+				help="""Continue verification after
+				 a reboot""",
+				)
+
+	return parse_args(parser)
+
+class SimTestCase(unittest.TestCase):
+
+	def setUp(self):
+		self.bus = dbus.SystemBus()
+
+		self.manager = dbus.Interface(self.bus.get_object('org.ofono',
+									'/'),
+							'org.ofono.Manager')
+		self.modems = self.manager.GetModems()
+
+	def get_simmanager(self, path):
+		return dbus.Interface(self.bus.get_object('org.ofono',
+							path),
+							'org.ofono.SimManager')
+	def if_supports_sim_offline(self):
+		if self.product != "krillin":
+			return True
+		else:
+			return False
+
+	def check_no_sim_present(self, path):
+
+		properties = self.get_simmanager(path).GetProperties()
+
+		return (properties["Present"] != 1)
+
+	def validate_modem_properties(self, path, test_online, test_sims):
+
+		modem = dbus.Interface(self.bus.get_object('org.ofono', path),
+					'org.ofono.Modem')
+		properties = modem.GetProperties()
+
+		if self.args.debug == True:
+			print("[ %s ]" % path)
+
+		for property in modem_properties:
+			self.assertTrue(property in properties)
+
+		self.assertTrue(properties["Revision"] != "ValueError")
+		self.assertTrue(properties["Type"] == "hardware")
+		self.assertTrue(properties["Manufacturer"] == "Fake Manufacturer")
+		self.assertTrue(properties["Model"] == "Fake Modem Model")
+		self.assertTrue(properties["Powered"] == 1)
+		self.assertTrue(properties["Emergency"] == 0)
+		self.assertTrue(properties["Lockdown"] == 0)
+
+		# emulator == "goldfish"
+		#
+		if self.product == "goldfish":
+			self.assertTrue(properties["Serial"] == "000000000000000")
+		else:
+			self.assertTrue(properties["Serial"] != "")
+
+		self.assertTrue(properties["Online"] == test_online)
+
+		# test features
+		features = properties["Features"]
+
+		if test_online:
+			if test_sims:
+                                check_features = sim_online_features[:]
+			else:
+                                check_features = no_sim_online_features[:]
+		else:
+			if self.product == "krillin":
+				check_features = []
+			else:
+				if test_sims:
+					check_features = sim_offline_features[:]
+				else:
+					check_features = no_sim_offline_features[:]
+
+		for feature in check_features:
+			if self.args.debug:
+				print(feature)
+
+			self.assertTrue(feature in features)
+
+		# test interfaces
+		ifaces = properties["Interfaces"]
+
+		if test_online:
+			if test_sims:
+				check_ifaces = sim_online_ifaces[:]
+
+				if self.product == "krillin":
+					check_ifaces.append(
+						"org.ofono.MtkSettings")
+			else:
+				check_ifaces = no_sim_online_ifaces[:]
+
+				# LP: #1399746; NetworkTime is only
+				# available on krillin in this state,
+				# and shouldn't be without a SIM present
+
+				if self.product == "krillin":
+					check_ifaces.append(
+						"org.ofono.NetworkTime")
+					check_ifaces.append(
+						"org.ofono.MtkSettings")
+		else:
+
+			# krillin no diff between sim/no-SIM when offline
+			if self.product == "krillin":
+				check_ifaces = no_sim_offline_ifaces[:]
+				check_ifaces.append("org.ofono.NetworkTime")
+			else:
+				if test_sims:
+					check_ifaces = sim_offline_ifaces[:]
+				else:
+					check_ifaces = no_sim_offline_ifaces[:]
+					check_ifaces.append("org.ofono.SimManager")
+
+		for iface in check_ifaces:
+			if self.args.debug:
+				print(iface)
+
+			self.assertTrue(iface in ifaces)
+
+		return modem
+
+	def validate_call_volume_properties(self, path):
+
+		call_volume = dbus.Interface(self.bus.get_object('org.ofono',
+									path),
+						'org.ofono.CallVolume')
+		properties = call_volume.GetProperties()
+		keys = list(properties.keys())
+
+		self.assertTrue(properties["MicrophoneVolume"] == 0)
+		self.assertTrue(properties["SpeakerVolume"] == 0)
+
+		# The value of 'Muted' differs on mako/krillin: see
+		# bug for details:
+		#
+		# https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1396317
+
+		if self.product == "krillin":
+			self.assertTrue(properties["Muted"] == 0)
+		else:
+			self.assertTrue(properties["Muted"] == 1)
+
+		self.assertTrue(keys.index("Muted") != "ValueError")
+
+	def validate_emergency_numbers(self, path):
+		# valid VoiceCallManager properties
+		voice = dbus.Interface(self.bus.get_object('org.ofono', path),
+						'org.ofono.VoiceCallManager')
+
+		properties = voice.GetProperties()
+		keys = list(properties.keys())
+
+		self.assertTrue(keys.index("EmergencyNumbers") != "ValueError")
+
+		numbers = properties["EmergencyNumbers"]
+
+		if self.args.debug:
+			print("%s" % numbers)
+
+		for number in numbers:
+			self.assertTrue(number in emergency_numbers)
+
+	def validate_sim_properties(self, path, mnc="", mcc="", subs=""):
+
+		# valid SimManager properties
+		properties = self.get_simmanager(path).GetProperties()
+		keys = list(properties.keys())
+
+		for property in sim_properties:
+			self.assertTrue(property in keys)
+
+		self.assertTrue(properties["Present"] == 1)
+
+		# Don't validate "Retries"; it's only populated
+		# after failed PIN/PUK unlock attempts
+
+		self.assertTrue(properties["BarredDialing"] == 0)
+		self.assertTrue(properties["FixedDialing"] == 0)
+
+		# emulator == "goldfish"
+		if self.product == "goldfish":
+			self.assertTrue(properties["SubscriberNumbers"][0]
+					== "15555215554")
+
+		self.assertTrue(properties["PinRequired"] == "none")
+
+                # validate optional properties
+
+		if "CardIdentifier" in keys and self.product == "goldfish":
+			self.assertTrue(properties["CardIdentifier"]
+					== "89014103211118510720")
+
+		if "MobileCountryCode" in keys:
+			if self.product == "goldfish":
+				self.assertTrue(properties["MobileCountryCode"]
+						 == "310")
+			elif mcc != "":
+				self.assertTrue(properties["MobileCountryCode"]
+						 == mcc)
+
+		if "MobileNetworkCode" in keys:
+			if self.product == "goldfish":
+				self.assertTrue(properties["MobileNetworkCode"]
+						 == "260")
+			elif mnc != "":
+				self.assertTrue(properties["MobileNetworkCode"]
+						 == mnc)
+
+		if "SubscriberIdentity" in keys:
+			if self.product == "goldfish":
+				self.assertTrue(properties["SubscriberIdentity"]
+						 == "310260000000000")
+			elif subs != "":
+				self.assertTrue(properties["SubscriberIdentity"]
+						 == subs)
+
+	def main(self, args):
+		self.args = args
+		self.product = get_product()
+
+		if args.debug:
+			print ("ro.build.product: %s" % self.product)
+
+		if len(args.modem) > 0:
+			self.validate_modem(args.modem)
+		else:
+			for modem in self.modems:
+				self.validate_modem(modem[0])

=== added file 'test/rilmodem/sim/test-no-sims-offline'
--- test/rilmodem/sim/test-no-sims-offline	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-no-sims-offline	2015-02-04 00:09:49 +0000
@@ -0,0 +1,82 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests no SIM(s) and modem(s) offline.
+
+This module contains a functional test which checks a running
+ofono/rilmodem/mtkmodem instance to ensure that the correct
+DBus properties are exported when no SIM(s) are inserted AND
+the corresponding modem(s) are offline.  As such it validates
+the properties of the following interfaces:
+
+ * org.ofono.Modem
+ * org.ofono.SimManager ( on supported hw )
+ * org.ofono.VoiceCallManager ( EmergencyNumbers )
+ * org.ofono.CallVolume
+
+NOTE - this test by default verifies all modems present a device.
+If the device is multi-SIM and not all slots have unlocked SIMs,
+then please use the -m to verify a specific modem.
+
+SETUP:
+
+ * Power off the phone
+
+ * Remove any SIMs
+
+ * Power on the phone
+
+ * Enable FlightMode from System Setttings ( or net indicator )
+
+ * Run this script
+
+ * [Optional] Reboot the phone and re-run script
+
+ * Disable FlightMode
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+from simtestutil import *
+
+class TestNoSimsOffline(SimTestCase):
+
+	def validate_modem(self, path):
+		self.validate_modem_properties(path, False, False)
+
+		# krillin doesn't expose SimManager when offline
+		if (self.product != "krillin"):
+			self.assertTrue(self.check_no_sim_present(path))
+
+		self.validate_emergency_numbers(path)
+		self.validate_call_volume_properties(path)
+
+	def test_main(self):
+		self.main(args)
+
+if __name__ == "__main__":
+	args = parse_args()
+
+	sim_unittest_main(args)

=== added file 'test/rilmodem/sim/test-no-sims-online'
--- test/rilmodem/sim/test-no-sims-online	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-no-sims-online	2015-02-04 00:09:49 +0000
@@ -0,0 +1,74 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests no SIM(s) and modem(s) online.
+
+This module contains a functional test which checks a running
+ofono/rilmodem/mtkmodem instance to ensure that the correct
+DBus properties are exported when no SIM(s) are inserted AND
+the corresponding modem(s) are online.  As such it validates
+the properties of the following interfaces:
+
+ * org.ofono.Modem
+ * org.ofono.SimManager
+ * org.ofono.VoiceCallManager ( EmergencyNumbers )
+ * org.ofono.CallVolume
+
+NOTE - this test by default verifies all modems present a device.
+If the device is multi-SIM and not all slots have unlocked SIMs,
+then please use the -m to verify a specific modem.
+
+SETUP:
+
+ * Power off the phone
+
+ * Remove any SIMs
+
+ * Power on the phone
+
+ * Run this script
+
+ * [Optional] Reboot the phone and re-run the script
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+from simtestutil import *
+
+class TestNoSimsOnline(SimTestCase):
+
+	def validate_modem(self, path):
+		self.validate_modem_properties(path, True, False)
+		self.assertTrue(self.check_no_sim_present(path))
+		self.validate_emergency_numbers(path)
+		self.validate_call_volume_properties(path)
+
+	def test_main(self):
+		self.main(args)
+
+if __name__ == "__main__":
+	args = parse_args()
+
+	sim_unittest_main(args)

=== added file 'test/rilmodem/sim/test-sim-change-pin'
--- test/rilmodem/sim/test-sim-change-pin	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-sim-change-pin	2015-02-04 00:09:49 +0000
@@ -0,0 +1,128 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests the abilty to change a SIM PIN.
+
+This module contains a functional test which checks an
+ofono/rilmodem/mtkmodem instance to ensure that the a
+SIM PIN can be changed.
+
+NOTE - this test by default tries to change the PIN of a
+single SIM.  If the device is multi-SIM, the first modem
+will be used by default.  The -m argument can be used to
+specify the second modem if needed.
+
+Requirements:
+
+ * a SIM with PIN-locking enabled
+
+ * the current PIN code for the SIM
+
+Setup:
+
+ * Ensure that FlightMode is NOT enabled
+
+ * Ensure that at least one SIM with PIN-locking
+   enabled is inserted in the phone AND STILL LOCKED!
+   ( ie. the PIN hasn't been entered yet )
+
+ * Run this script
+
+Notes:
+
+On some phones, this script will enter the SIM PIN
+to unlock it before changing the PIN.
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+import simtestutil
+
+from simtestutil import *
+
+def parse_test_args():
+
+	parser = argparse.ArgumentParser()
+
+	parser.add_argument("--old-pin",
+				dest="old_pin",
+				help="""Specify the SIM PIN code""",
+				required="yes",
+				)
+
+	parser.add_argument("--new-pin",
+				dest="new_pin",
+				help="""Specify the new SIM PIN code""",
+				required="yes"
+				)
+
+	return parse_args(parser)
+
+class TestSimChangePin(SimTestCase):
+
+	def change_pin_lock(self, path):
+
+		if self.args.debug:
+			print("change_pin_lock called, "
+				"pin= {} "
+				"new_pin: {}".format(self.args.old_pin,
+							self.args.new_pin))
+
+		simmanager = self.get_simmanager(path)
+		properties = simmanager.GetProperties()
+
+		locked_pins = properties["LockedPins"]
+		self.assertTrue(len(locked_pins) == 1)
+		self.assertTrue(locked_pins[0] == "pin")
+
+		if self.product == "krillin" and properties["PinRequired"] == "pin":
+			simmanager.EnterPin("pin", self.args.old_pin)
+
+		simmanager.ChangePin("pin", self.args.old_pin,
+					self.args.new_pin)
+
+		simmanager.UnlockPin("pin", self.args.new_pin)
+		simmanager.LockPin("pin", self.args.new_pin)
+
+		properties = simmanager.GetProperties()
+
+		locked_pins = properties["LockedPins"]
+		self.assertTrue(len(locked_pins) == 1)
+		self.assertTrue(locked_pins[0] == "pin")
+
+		self.assertTrue(properties["PinRequired"] == "none")
+
+	def validate_modem(self, path):
+
+		self.change_pin_lock(path)
+
+	def test_main(self):
+		self.main(args)
+
+if __name__ == "__main__":
+	args = parse_test_args()
+
+	sim_unittest_main(args)
+

=== added file 'test/rilmodem/sim/test-sim-disable-pin-lock'
--- test/rilmodem/sim/test-sim-disable-pin-lock	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-sim-disable-pin-lock	2015-02-04 00:09:49 +0000
@@ -0,0 +1,106 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests disabling PIN locking for a SIM.
+
+This module contains a functional test which checks an
+ofono/rilmodem/mtkmodem instance to ensure that the correct
+things happen when SIM PIN locking is disabled.
+
+NOTE - this test by default disables locking for a single SIM.
+If the device is multi-SIM, the first modem will be used by
+default.  The -m argument can be used to specify the second
+modem if needed.
+
+Requirements:
+
+ * a locked SIM card
+
+ * the current PIN code for the SIM
+
+SETUP:
+
+ * Ensure that at least one locked SIM is inserted in the phone
+
+ * Ensure that FlightMode is NOT enabled
+
+ * [Optional] Some phones may require the SIM to be entered
+   before PIN locking can be disabled.
+
+ * Run this script
+
+ * Reboot the phone and re-run this script specifying --continue
+   ( DON'T enter the PIN on the UI after rebooting!!! )
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+import simtestutil
+
+from simtestutil import *
+
+class TestSimDisablePinLock(SimTestCase):
+
+	def validate_pin_props(self, path):
+		simmanager = self.get_simmanager(path)
+		properties = simmanager.GetProperties()
+
+		self.assertTrue(len(properties["LockedPins"]) == 0)
+		self.assertTrue(properties["PinRequired"] == "none")
+
+	def disable_pin_lock(self, path):
+
+		simmanager = self.get_simmanager(path)
+		properties = simmanager.GetProperties()
+
+		if self.args.debug:
+			print("disable_pin_lock called, LockedPins: %s"
+				% properties["LockedPins"])
+			print("pin=%s" % self.args.pin)
+
+		locked_pins = properties["LockedPins"]
+		self.assertTrue(len(locked_pins) == 1)
+		self.assertTrue(locked_pins[0] == "pin")
+
+		simmanager.UnlockPin("pin", self.args.pin)
+		properties = simmanager.GetProperties()
+		self.assertTrue(len(properties["LockedPins"]) == 0)
+
+	def validate_modem(self, path):
+
+		if self.args.cont == False:
+			self.validate_modem_properties(path, True, True)
+			self.disable_pin_lock(path)
+		else:
+			self.validate_pin_props(path)
+
+	def test_main(self):
+		self.main(args)
+
+if __name__ == "__main__":
+	args = simtestutil.parse_lock_test_args()
+
+	sim_unittest_main(args)
+

=== added file 'test/rilmodem/sim/test-sim-enable-pin-lock'
--- test/rilmodem/sim/test-sim-enable-pin-lock	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-sim-enable-pin-lock	2015-02-04 00:09:49 +0000
@@ -0,0 +1,101 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests enabling a SIM for PIN locking.
+
+This module contains a functional test which checks an
+ofono/rilmodem/mtkmodem instance to ensure that the correct
+things happen when SIM PIN locking is enabled.
+
+NOTE - this test by default enables locking for a single SIM.
+If the device is multi-SIM, the first modem will be used by
+default.  The -m argument can be used to specify the second
+modem if needed.
+
+Requirements:
+
+ * an unlocked SIM card
+
+ * the current PIN code for the SIM
+
+SETUP:
+
+ * Ensure that at least one unlocked SIM is inserted in the phone
+
+ * Ensure that FlightMode is NOT enabled
+
+ * Run this script
+
+ * Reboot the phone and re-run this script specifying --continue
+   ( DON'T enter the PIN on the UI after rebooting!!! )
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+import simtestutil
+
+from simtestutil import *
+
+class TestSimEnablePinLock(SimTestCase):
+
+	def validate_pin_props(self, path):
+		simmanager = self.get_simmanager(path)
+		properties = simmanager.GetProperties()
+
+		self.assertTrue(len(properties["LockedPins"]) == 1)
+		self.assertTrue(properties["PinRequired"] == "pin")
+
+	def enable_pin_lock(self, path):
+
+		if self.args.debug:
+			print("enable_pin_lock called, pin=%s" % self.args.pin)
+
+		simmanager = self.get_simmanager(path)
+		properties = simmanager.GetProperties()
+		self.assertTrue(len(properties["LockedPins"]) == 0)
+
+		simmanager.LockPin("pin", self.args.pin)
+		properties = simmanager.GetProperties()
+
+		locked_pins = properties["LockedPins"]
+		self.assertTrue(len(locked_pins) == 1)
+		self.assertTrue(locked_pins[0] == "pin")
+
+	def validate_modem(self, path):
+
+		if self.args.cont == False:
+			self.validate_modem_properties(path, True, True)
+			self.enable_pin_lock(path)
+		else:
+			self.validate_pin_props(path)
+
+	def test_main(self):
+		self.main(args)
+
+if __name__ == "__main__":
+	args = simtestutil.parse_lock_test_args()
+
+	sim_unittest_main(args)
+

=== added file 'test/rilmodem/sim/test-sim-pin-unlock'
--- test/rilmodem/sim/test-sim-pin-unlock	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-sim-pin-unlock	2015-02-04 00:09:49 +0000
@@ -0,0 +1,149 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests the abilty to unlock a locked SIM for use.
+
+This module contains a functional test which checks an
+ofono/rilmodem/mtkmodem instance to ensure that the a
+SIM PIN can be entered and thus unlock the SIM for use.
+
+NOTE - this test by default tries to unlock the PIN of a
+single SIM.  If the device is multi-SIM, the first modem
+will be used by default.  The -m argument can be used to
+specify the second modem if needed.
+
+Requirements:
+
+ * a SIM with PIN-locking enabled
+
+ * the current PIN code for the SIM
+
+Setup:
+
+ * Ensure that FlightMode is NOT enabled
+
+ * Ensure that at least one SIM with PIN-locking
+   enabled is inserted in the phone AND STILL LOCKED!
+   ( ie. the PIN hasn't been entered yet )
+
+ * Run this script
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+import dbus.mainloop.glib
+import simtestutil
+
+from gi.repository import GLib
+from simtestutil import *
+
+def parse_test_args():
+
+	parser = argparse.ArgumentParser()
+
+	parser.add_argument("--pin",
+				dest="pin",
+				help="""Specify the SIM PIN code""",
+				required="yes",
+				)
+
+	parser.add_argument("-t",
+			"--timeout",
+			dest="timeout",
+			help="""Specify a timeout which causes
+			the script to exit""",
+			default=10,
+			)
+
+	return parse_args(parser)
+
+class TestSimPukUnlock(SimTestCase):
+
+	def setUp(self):
+		self.args = args
+		self.product = get_product()
+		self.timer = False
+
+		self.mainloop = GLib.MainLoop()
+
+		dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+		SimTestCase.setUp(self)
+
+		interval_ms = 1000 * int(self.args.timeout)
+		GLib.timeout_add(interval_ms, self.timeout_cb)
+
+	def pin_unlock(self, path):
+
+		if self.args.debug:
+			print("pin_unlock called,"
+				"pin: {}".format(self.args.pin))
+
+		simmanager = self.get_simmanager(path)
+		simmanager.connect_to_signal("PropertyChanged",
+						 self.sim_listener)
+
+		properties = simmanager.GetProperties()
+
+		locked_pins = properties["LockedPins"]
+		self.assertTrue(len(locked_pins) == 1)
+		self.assertTrue(locked_pins[0] == "pin")
+
+		self.assertTrue(properties["PinRequired"] == "pin")
+
+		simmanager.EnterPin("pin", self.args.pin)
+
+	def sim_listener(self, name, value):
+		if self.args.debug:
+			print("SIM property: {} changed "
+				"to {}".format(name, str(value)))
+
+		if name == "PinRequired":
+			self.assertTrue(value == "none")
+			self.mainloop.quit()
+
+	def timeout_cb(self):
+		if self.args.debug:
+			print("ALL DONE - timer fired!!!")
+
+		self.timer = True
+		self.mainloop.quit()
+
+	def validate_modem(self, path):
+
+		self.pin_unlock(path)
+
+		self.mainloop.run()
+
+		self.assertTrue(self.timer == False)
+
+	def test_main(self):
+		self.main(args)
+
+if __name__ == "__main__":
+	args = parse_test_args()
+
+	sim_unittest_main(args)
+

=== added file 'test/rilmodem/sim/test-sim-puk-unlock'
--- test/rilmodem/sim/test-sim-puk-unlock	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-sim-puk-unlock	2015-02-04 00:09:49 +0000
@@ -0,0 +1,227 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests the abilty to unlock a PUK-locked SIM.
+
+Requirements:
+
+ * a SIM with PIN-locking enabled
+
+ * the current PUK code for the SIM
+
+Setup:
+
+ * Ensure that FlightMode is NOT enabled
+
+ * Ensure that at least one SIM with PIN-locking
+   enabled is inserted in the phone AND STILL LOCKED!
+   ( ie. the PIN hasn't been entered yet )
+
+ * Run this script
+
+Notes:
+
+This script will actually cause the SIM to become PUK-locked
+by entering a hard-coded SIM three times in a row.  This is
+done to verify that the 'Retries' property is properly updated
+on incorrect PIN attempts.  Likewise, once PUK-locked this
+test will also attempt on incorrect PUK reset to again check
+'Retries'.  It will then reset the SIM to the given new PIN.
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+import dbus.mainloop.glib
+import simtestutil
+
+from gi.repository import GLib
+from simtestutil import *
+
+def parse_test_args():
+
+	parser = argparse.ArgumentParser()
+
+	parser.add_argument("--puk",
+				dest="puk",
+				help="""Specify the SIM PUK code""",
+				required="yes",
+				)
+
+	parser.add_argument("--new-pin",
+				dest="new_pin",
+				help="""Spicy the new SIM PIN code""",
+				required="yes"
+				)
+
+	parser.add_argument("-t",
+			"--timeout",
+			dest="timeout",
+			help="""Specify a timeout which causes
+			the script to exit""",
+			default=10,
+			)
+
+	return parse_args(parser)
+
+class TestSimUnlockPuk(SimTestCase):
+
+	def setUp(self):
+		self.args = args
+		self.product = get_product()
+		self.pin_retries = 3
+		self.puk_retries = 10
+		self.pin_retry_failure = False
+		self.puk_retry_failure = False
+		self.timeout_failure = False
+		self.bad_puk_sent = False
+
+		self.mainloop = GLib.MainLoop()
+
+		dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+		SimTestCase.setUp(self)
+
+		interval_ms = 1000 * int(self.args.timeout)
+		GLib.timeout_add(interval_ms, self.timeout_cb)
+
+	def enter_bad_pin(self, path, simmanager=None):
+		if simmanager == None:
+			simmanager = self.get_simmanager(path)
+
+		try:
+			simmanager.EnterPin("pin", "0000")
+		except dbus.DBusException as e:
+			if self.args.debug:
+				print("EnterPin failed")
+
+	def enter_puk(self, path, puk, pin, simmanager=None):
+		if simmanager == None:
+			simmanager = self.get_simmanager(path)
+
+		try:
+			simmanager.ResetPin("puk", puk, pin)
+		except dbus.DBusException as e:
+			if self.args.debug:
+				print("ResetPin failed")
+
+			# now do a valid PUK unlock
+			if self.bad_puk_sent == False:
+				self.bad_puk_sent = True
+				self.enter_puk(path,
+						self.args.puk,
+						self.args.new_pin)
+
+	def retry_listener(self, name, value, path):
+		if self.args.debug:
+			print("modem: {} SIM property: {} changed "
+				"to {}".format(path, name, str(value)))
+
+		if name == "Retries" and len(value) > 0:
+
+			# bug: lp: #14028 - Retries not updated for
+			# bad PUK attempts!  If it's possible to fix
+			# this bug, then code should be added here to
+			# validate puk retries decreasing...
+
+			if self.bad_puk_sent == False:
+				if "pin" in value:
+					retries = int(value["pin"])
+				else:
+					retries = 0
+
+				if retries != (self.pin_retries - 1):
+					self.pin_retry_failure = True
+					self.mainloop.quit()
+				else:
+					self.pin_retries = retries
+
+				if retries > 0:
+					if self.args.debug:
+						print("enter another bad pin")
+
+					self.enter_bad_pin(path)
+
+		elif name == "PinRequired":
+			if value == "none":
+				if self.args.debug:
+					print("Pin reset; all done!");
+
+				self.mainloop.quit()
+			elif value == "puk":
+
+				# trigger an invalid PUK unlock
+				self.enter_puk(path,
+						"0000000000",
+						"0000")
+
+	def timeout_cb(self):
+		if self.args.debug:
+			print("ALL DONE - timer fired!!!")
+
+		self.timeout_failure = True
+		self.mainloop.quit()
+
+	def puk_unlock(self, path):
+
+		if self.args.debug:
+			print("puk_unlock called, puk= {} "
+				"new_pin: {}".format(self.args.puk,
+							self.args.new_pin))
+
+		simmanager = self.get_simmanager(path)
+		properties = simmanager.GetProperties()
+
+		# verify SIM is PIN-locked
+		locked_pins = properties["LockedPins"]
+		self.assertTrue(len(locked_pins) == 1)
+		self.assertTrue(locked_pins[0] == "pin")
+
+		self.assertTrue(properties["PinRequired"] == "pin")
+
+		# enter wrong PIN x3
+		simmanager.connect_to_signal("PropertyChanged",
+						self.retry_listener,
+						path_keyword="path")
+
+		self.enter_bad_pin(path, simmanager)
+
+	def validate_modem(self, path):
+
+		self.puk_unlock(path)
+
+		self.mainloop.run()
+
+		self.assertFalse(self.timeout_failure)
+		self.assertFalse(self.pin_retry_failure)
+		self.assertFalse(self.puk_retry_failure)
+
+	def test_main(self):
+		self.main(args)
+
+if __name__ == "__main__":
+	args = parse_test_args()
+
+	sim_unittest_main(args)
+

=== added file 'test/rilmodem/sim/test-sim-removal'
--- test/rilmodem/sim/test-sim-removal	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-sim-removal	2015-02-04 00:09:49 +0000
@@ -0,0 +1,156 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests SIM removal detection/notification
+
+This module contains a functional test which checks a running
+ofono/rilmodem/mtkmodem instance to ensure that the correct
+DBus signals are generated and the correct properties updated
+when a SIM is removed from a running device.  The script by
+default will wait for 60 seconds for the SIM to be removed after
+which it will exit.
+
+NOTE - this test by default verifies the removal of a SIM from
+a single modem.  If the device is multi-SIM, the first modem
+will be used by default.  The -m argument can be used to specify
+the second modem if needed.
+
+SETUP:
+
+ * Run this script
+
+ * Remove the SIM card
+
+Options:
+
+ * -t / --timer - specify a timeout after which the script
+    will exit.
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+import dbus.mainloop.glib
+import simtestutil
+
+from gi.repository import GLib
+from simtestutil import *
+
+def parse_args():
+
+	parser = argparse.ArgumentParser()
+
+	parser.add_argument("-t",
+			"--timeout",
+			dest="timeout",
+			help="""Specify a timeout which causes
+			the script to exit""",
+			default=60,
+			)
+
+	return simtestutil.parse_args(parser)
+
+class TestSimRemovalNotification(SimTestCase):
+
+	def modem_listener(self, name, value, path=None):
+		if self.args.debug:
+			print("Modem property: '%s' changed to '%s'"
+				% (name, str(value)))
+
+		if name == "Interfaces":
+			if "org.ofono.SimManager" in value:
+				if (self.check_no_sim_present(path) != True):
+					self.sim_present_failure = True
+
+				self.mainloop.quit()
+
+	def sim_listener(self, name, value):
+		if self.args.debug:
+			print("SIM property: '%s' changed to '%s'"
+				% (name, str(value)))
+
+		if name == "Present":
+			if value != 0:
+				self.sim_present_signal_failure = True
+
+			self.mainloop.quit()
+
+	def setUp(self):
+		self.args = args
+		self.product = get_product()
+
+		self.sim_present_failure = False
+		self.sim_present_signal_failure = False
+		self.timeout_failure = False
+
+		self.mainloop = GLib.MainLoop()
+
+		dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+		SimTestCase.setUp(self)
+
+		interval_ms = 1000 * int(self.args.timeout)
+		GLib.timeout_add(interval_ms, self.timeout_cb)
+
+	def timeout_cb(self):
+		if self.args.debug:
+			print("ALL DONE - timer fired!!!")
+
+		self.timeout_failure = True
+		self.mainloop.quit()
+
+	def validate_modem(self, path):
+		modem = self.validate_modem_properties(path, True, True)
+
+		if self.if_supports_sim_offline() == True:
+
+			# valid SimManager properties
+			simmanager = self.get_simmanager(path)
+
+			simmanager.connect_to_signal("PropertyChanged",
+						 self.sim_listener)
+		else:
+			modem.connect_to_signal("PropertyChanged",
+						 self.modem_listener,
+						path_keyword="path")
+
+	def test_main(self):		
+		if args.debug:
+			print ("ro.build.product: %s" % self.product)
+
+		if len(args.modem) > 0:
+			self.validate_modem(args.modem)
+		else:
+			self.validate_modem(self.modems[0][0])
+
+		self.mainloop.run()
+
+		self.assertFalse(self.timeout_failure)
+		self.assertFalse(self.sim_present_failure)
+		self.assertFalse(self.sim_present_signal_failure)
+
+if __name__ == "__main__":
+	args = parse_args()
+
+	sim_unittest_main(args)

=== added file 'test/rilmodem/sim/test-sims-offline'
--- test/rilmodem/sim/test-sims-offline	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-sims-offline	2015-02-04 00:09:49 +0000
@@ -0,0 +1,106 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests SIM(s) and modem(s) offline.
+
+This module contains a functional test which checks a running
+ofono/rilmodem/mtkmodem instance to ensure that the correct
+DBus properties are exported when one or more SIMs (unlocked)
+are inserted AND the corresponding modem(s) are offline. As such
+it validates the properties of the followinh interfaces:
+
+ * org.ofono.Modem
+ * org.ofono.SimManager ( on supported hw )
+ * org.ofono.VoiceCallManager ( EmergencyNumbers )
+ * org.ofono.CallVolume
+
+NOTE - this test by default verifies all modems present a device.
+If the device is multi-SIM and not all slots have unlocked SIMs,
+then please use the -m to verify a specific modem.
+
+SETUP:
+
+ * Ensure that at least one unlocked SIM is inserted in the phone
+
+ * Ensure FlightMode from System Settings ( or net-indicator )
+
+ * Run this script
+
+ * Disable FlightMode
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+import argparse
+import simtestutil
+
+from simtestutil import *
+
+def parse_args():
+	parser = argparse.ArgumentParser()
+
+	parser.add_argument("--mnc",
+			dest="mnc",
+			help="""Specify a MNC (mobile-network-code) to
+			match against""",
+			default="",
+			)
+	parser.add_argument("--mcc",
+			dest="mcc",
+			help="""Specify a MCC (mobile-country-code) to
+			match against""",
+			default="",
+			)
+	parser.add_argument("--subscriber",
+			dest="subscriber",
+			help="""Specify a SubscriberIdentity to
+			match against""",
+			default="",
+			)
+
+	return simtestutil.parse_args(parser)
+
+class TestSimsOffline(SimTestCase):
+
+	def validate_modem(self, path):
+
+		self.validate_modem_properties(path, False, True)
+
+		# krillin: no SIM access when modem offline
+		if (self.product != "krillin"):
+			self.validate_sim_properties(path, self.args.mcc,
+							self.args.mnc,
+							self.args.subscriber)
+
+		self.validate_emergency_numbers(path)
+		self.validate_call_volume_properties(path)
+
+	def test_main(self):
+		self.main(args)
+
+if __name__ == "__main__":
+	args = parse_args()
+
+	sim_unittest_main(args)

=== added file 'test/rilmodem/sim/test-sims-online'
--- test/rilmodem/sim/test-sims-online	1970-01-01 00:00:00 +0000
+++ test/rilmodem/sim/test-sims-online	2015-02-04 00:09:49 +0000
@@ -0,0 +1,108 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+"""Tests SIM(s) and modem(s) online.
+
+This module contains a functional test which checks a running
+ofono/rilmodem/mtkmodem instance to ensure that the correct
+DBus properties are exported when one or more SIMs are
+inserted AND the corresponding modem(s) are online.
+
+NOTE - this test by default verifies all modems present a device.
+If the device is multi-SIM and not all slots have unlocked SIMs,
+then please use the -m to verify a specific modem.
+
+SETUP:
+
+ * Ensure that at least one unlocked SIM is inserted in the phone
+
+ * Ensure that FlightMode is NOT enabled
+
+ * Run this script
+
+Options:
+
+ * --mnc - specify a mobile network code to match against
+
+ * --mcc - specify a mobile country code to match against
+
+ * --subscriber - specify a subscriber identity to match against
+
+ToDo:
+ * If run on the emulator, make this script use console
+   commands to configure the modem(s) for the required
+   conditions ( ie. no SIM(s), online )
+"""
+
+import argparse
+import simtestutil
+
+from simtestutil import *
+
+def parse_args():
+
+	parser = argparse.ArgumentParser()
+
+	parser.add_argument("--mnc",
+			dest="mnc",
+			help="""Specify a MNC (mobile-network-code) to
+			match against""",
+			default="",
+			)
+
+	parser.add_argument("--mcc",
+			dest="mcc",
+			help="""Specify a MCC (mobile-country-code) to
+			match against""",
+			default="",
+			)
+
+	parser.add_argument("--subscriber",
+			dest="subscriber",
+			help="""Specify a SubscriberIdentity to
+			match against""",
+			default="",
+			)
+
+	return simtestutil.parse_args(parser)
+
+class TestSimsOnline(SimTestCase):
+
+	def validate_modem(self, path):
+		self.validate_modem_properties(path, True, True)
+
+
+		self.validate_sim_properties(path, self.args.mcc,
+						self.args.mnc,
+						self.args.subscriber)
+
+		self.validate_emergency_numbers(path)
+		self.validate_call_volume_properties(path)
+
+	def test_main(self):
+		self.main(args)
+
+if __name__ == "__main__":
+	args = parse_args()
+
+	sim_unittest_main(args)
+

=== modified file 'test/test-call-forwarding'
--- test/test-call-forwarding	2014-03-13 18:19:25 +0000
+++ test/test-call-forwarding	2015-02-04 00:09:49 +0000
@@ -53,6 +53,8 @@
 
 def main(args):
 
+	path = ""
+
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
 	bus = dbus.SystemBus()
@@ -62,16 +64,22 @@
 
 	modems = manager.GetModems()
 
-        if (args.modem == ""):
-                modem = modems[0][0]
-
-        if (args.noreply_timeout == -1):
-                noreply_timeout = dbus.UInt16(30)
-        else:
-                noreply_timeout = dbus.UInt16(args.noreply_timeout)
-
-	cf = dbus.Interface(bus.get_object('org.ofono', modem),
-				'org.ofono.CallForwarding')
+	assert len(modems) >= 1
+
+	for modem in modems:
+		if modem[0] == args.modem:
+			path = args.modem
+
+	if path == "":
+		path = modems[0][0]
+
+	if args.noreply_timeout == -1:
+		noreply_timeout = dbus.UInt16(30)
+	else:
+		noreply_timeout = dbus.UInt16(args.noreply_timeout)
+
+	cf = dbus.Interface(bus.get_object('org.ofono', path),
+						'org.ofono.CallForwarding')
 
 	cf.connect_to_signal("PropertyChanged", property_changed)
 

=== modified file 'unit/test-grilrequest.c'
--- unit/test-grilrequest.c	2014-07-16 22:55:36 +0000
+++ unit/test-grilrequest.c	2015-02-04 00:09:49 +0000
@@ -821,6 +821,40 @@
 	.parcel_size = sizeof(req_oem_hook_raw_valid_2),
 };
 
+/* set_initial_attach_apn tests */
+
+struct request_test_set_initial_attach_apn {
+	const char *apn;
+	const int proto;
+	const char *user;
+	const char *passwd;
+	const char *mccmnc;
+	const guchar *parcel_data;
+	gsize parcel_size;
+};
+
+static const guchar req_set_initial_attach_apn_valid_1[] = {
+	0x0c, 0x00, 0x00, 0x00, 0x61, 0x00, 0x69, 0x00, 0x72, 0x00, 0x74, 0x00,
+	0x65, 0x00, 0x6c, 0x00, 0x77, 0x00, 0x61, 0x00, 0x70, 0x00, 0x2e, 0x00,
+	0x65, 0x00, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x49, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x07, 0x00, 0x00, 0x00, 0x77, 0x00, 0x61, 0x00, 0x70, 0x00, 0x40, 0x00,
+	0x77, 0x00, 0x61, 0x00, 0x70, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+	0x77, 0x00, 0x61, 0x00, 0x70, 0x00, 0x31, 0x00, 0x32, 0x00, 0x35, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_set_initial_attach_apn
+					set_initial_attach_apn_valid_test_1 = {
+	.apn = "airtelwap.es",
+	.proto = OFONO_GPRS_PROTO_IP,
+	.user = "wap@wap",
+	.passwd = "wap125",
+	.mccmnc = "21401",
+	.parcel_data = req_set_initial_attach_apn_valid_1,
+	.parcel_size = sizeof(req_set_initial_attach_apn_valid_1),
+};
+
 /*
  * The following hexadecimal data represents a serialized Binder parcel
  * instance containing a valid RIL_REQUEST_RADIO_POWER 'OFF' message.
@@ -1338,6 +1372,22 @@
 	parcel_free(&rilp);
 }
 
+static void test_request_set_initial_attach_apn(gconstpointer data)
+{
+	const struct request_test_set_initial_attach_apn *test_data = data;
+	struct parcel rilp;
+
+	g_ril_request_set_initial_attach_apn(NULL, test_data->apn,
+					test_data->proto, test_data->user,
+					test_data->passwd, test_data->mccmnc,
+					&rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,
+				test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
 static void test_request_change_barring_password(gconstpointer data)
 {
 	const struct request_test_change_barring_password_data *test_data =
@@ -1627,6 +1677,10 @@
 				&oem_hook_raw_valid_test_2,
 				test_request_oem_hook_raw);
 
+	g_test_add_data_func("/testgrilrequest/set-ia-apn: "
+				"valid SET_INITIAL_ATTACH_APN Test 1",
+				&set_initial_attach_apn_valid_test_1,
+				test_request_set_initial_attach_apn);
 #endif
 	return g_test_run();
 }

=== modified file 'unit/test-mtkreply.c'
--- unit/test-mtkreply.c	2014-11-17 15:43:36 +0000
+++ unit/test-mtkreply.c	2015-02-04 00:09:49 +0000
@@ -36,6 +36,7 @@
 #include "common.h"
 #include "grilreply.h"
 #include "drivers/mtkmodem/mtk_constants.h"
+#include "drivers/mtkmodem/mtkrequest.h"
 #include "drivers/mtkmodem/mtkreply.h"
 
 /*
@@ -57,6 +58,11 @@
 	const struct ril_msg msg;
 };
 
+struct rep_query_modem_type_test {
+	int type;
+	const struct ril_msg msg;
+};
+
 /*
  * The following hexadecimal data contains the event data of a valid
  * MTK-specific RIL_REQUEST_AVAILABLE_NETWORKS with the following parameters:
@@ -124,6 +130,27 @@
 	}
 };
 
+/*
+ * The following hexadecimal data contains the reply to a
+ * MTK_RIL_REQUEST_QUERY_MODEM_TYPE request with parameter {6}