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

[Tony Espy]

  * ubuntu-apndb.c, src/common.c, test-common.c: provision IA APNs
    LTE modems may require a new IA APN for non-GPRS operation,
    this change allows a new IA APN type to be provisioned along
    with Internet and MMS APNs.
  * gril/grilunsol.c: LTE signal strength fix (LP: #1433867)
  * ubuntu-apndb.c: load APNS w/out explict type (LP: #1437200)
  * mtkodem, plugins/mtk.c, unit/tesk-mtkunsol.c: Dynamic MTK firwmare switching
    This change causes the firmware on specific MTK-based phone to be
    dynamically switched/reset based on SIM type and roaming conditions.
  * include, plugins/mtk.c, src/modem.c, gprs.c: set data for just one slot (LP: #1413672)
    Make sure ConnectionManager.Powered property is set for only one slot in
    case the modem is of type dual SIM stand-by.
  * doc, gprs: add 'Preferred' property to GPRS contexts (LP: #1361864)

This change includes bug fixes, as well as a change needed for LTE, and one arale-specific feature:

 * provision IA APNs ( LTE )

 * LTE signal strength fix (LP: #1433867)

 * load APNS w/out explict type (LP: #1437200)

 * Dynamic MTK firwmare switching (arale)

 * [krillin] set data for just one slot (LP: #1413672)

 * add 'Preferred' property to GPRS contexts (LP: #1361864)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

The changes to add the 'Preferred' property are actually missing (commits dff2e80 and 0f42b18 from github).

And there are changes in the MP that are not mentioned in changelog:

 * rilmodem/gprs.c: dynamically set authtype based on credentials (LP: #1435784)
 * src/common.c: allow empty APNs when provisioning

review: Needs Fixing

[lp:~phablet-team/ofono/ww13-update]

6892. By Tony Espy on 2015-04-06

* ubuntu-apndb.c, src/common.c, test-common.c: provision IA APNs
  LTE modems may require a new IA APN for non-GPRS operation,
  this change allows a new IA APN type to be provisioned along
  with Internet and MMS APNs.
* gril/grilunsol.c: LTE signal strength fix (LP: #1433867)
* ubuntu-apndb.c: load APNS w/out explict type (LP: #1437200)
* mtkodem, plugins/mtk.c, unit/tesk-mtkunsol.c: Dynamic MTK firwmare switching
  This change causes the firmware on specific MTK-based phone to be
  dynamically switched/reset based on SIM type and roaming conditions.
* include, plugins/mtk.c, src/modem.c, gprs.c: set data for just one slot (LP: #1413672)
  Make sure ConnectionManager.Powered property is set for only one slot in
  case the modem is of type dual SIM stand-by.
* doc, gprs: add 'Preferred' property to GPRS contexts (LP: #1361864)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

All changes tested (except FW loading, as a China Mobile SIM is required for that) and sanity tests performed for:

current build number: 163
device name: m75 -> arale
channel: ubuntu-touch/vivid-proposed
last update: 2015-04-06 12:29:08
version version: 163

current build number: 177
device name: krillin
channel: ubuntu-touch/vivid-proposed
last update: 2015-04-07 10:18:29
version version: 177
version ubuntu: 20150407
version device: 20150326-f0c5ba5
version custom: 20150407

Note: USSD is not working currently due to bug #1438273 (telephony service). However, it can be tested using ofono scripts.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Bug #1441135 has been discovered while testing.

[Ricardo Salveti (rsalveti)]

Sanity tests fine on Mako:
current build number: 164
device name: mako
channel: ubuntu-touch/devel-proposed
alias: ubuntu-touch/vivid-proposed
last update: 2015-04-07 17:34:29
version version: 164
version ubuntu: 20150407
version device: 20150210
version custom: 20150407

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-17 11:26:04 +0000
+++ debian/changelog	2015-04-06 14:34:59 +0000
@@ -1,3 +1,22 @@
+ofono (1.12.bzr6892+15.04.20150401-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Alfonso Sanchez-Beato ]
+  * ubuntu-apndb.c, src/common.c, test-common.c: provision IA APNs
+    LTE modems may require a new IA APN for non-GPRS operation,
+    this change allows a new IA APN type to be provisioned along
+    with Internet and MMS APNs.
+  * gril/grilunsol.c: LTE signal strength fix (LP: #1433867)
+  * ubuntu-apndb.c: load APNS w/out explict type (LP: #1437200)
+  * mtkodem, plugins/mtk.c, unit/tesk-mtkunsol.c: Dynamic MTK firwmare switching
+    This change causes the firmware on specific MTK-based phone to be
+    dynamically switched/reset based on SIM type and roaming conditions.
+  * include, plugins/mtk.c, src/modem.c, gprs.c: set data for just one slot (LP: #1413672)
+    Make sure ConnectionManager.Powered property is set for only one slot in
+    case the modem is of type dual SIM stand-by.
+  * doc, gprs: add 'Preferred' property to GPRS contexts (LP: #1361864)
+
+ -- CI Train Bot <[e-mail]>  Wed, 01 Apr 2015 11:54:49 -0400
+
 ofono (1.12.bzr6890+15.04.20150317-0ubuntu1) vivid; urgency=medium
 
   [ Alfonso Sanchez-Beato ]

=== modified file 'doc/connman-api.txt'
--- doc/connman-api.txt	2011-03-15 22:11:59 +0000
+++ doc/connman-api.txt	2015-04-06 14:34:59 +0000
@@ -203,6 +203,14 @@
 			context.  The name should not be empty and limited
 			to a short string for display purposes.
 
+		boolean Preferred [readwrite]
+
+			Holds a boolean.  This value is meant to be used by
+			clients to store an indication on whether this context
+			is preferred compared to others.  ofono just stores and
+			shows this value, but does not use it internally. The
+			exact way in which this is used depends on the clients.
+
 		dict Settings [readonly, optional]
 
 			Holds all the IP network settings

=== modified file 'drivers/mtkmodem/mtkrequest.h'
--- drivers/mtkmodem/mtkrequest.h	2015-01-28 07:52:59 +0000
+++ drivers/mtkmodem/mtkrequest.h	2015-04-06 14:34:59 +0000
@@ -57,9 +57,9 @@
 #define MTK_MD_TYPE_3G 2
 #define MTK_MD_TYPE_WG 3
 #define MTK_MD_TYPE_TG 4
-/* FDD CSFB modem */
+/* FDD CSFB modem: LTE FDD - WCDMA - GSM */
 #define MTK_MD_TYPE_LWG 5
-/* TDD CSFB modem */
+/* TDD CSFB modem: LTE TDD - TD-SCDMA - GSM */
 #define MTK_MD_TYPE_LTG 6
 /* SGLTE modem */
 #define MTK_MD_TYPE_LTNG 7

=== modified file 'drivers/mtkmodem/mtkunsol.c'
--- drivers/mtkmodem/mtkunsol.c	2015-01-28 07:52:19 +0000
+++ drivers/mtkmodem/mtkunsol.c	2015-04-06 14:34:59 +0000
@@ -162,3 +162,38 @@
 	return -1;
 
 }
+
+struct parcel_str_array *g_mtk_unsol_parse_plmn_changed(GRil *gril,
+						const struct ril_msg *message)
+{
+	struct parcel rilp;
+	struct parcel_str_array *str_arr;
+	int i;
+
+	g_ril_init_parcel(message, &rilp);
+
+	str_arr = parcel_r_str_array(&rilp);
+	if (str_arr == NULL || str_arr->num_str == 0) {
+		ofono_error("%s: parse error for %s", __func__,
+				ril_request_id_to_string(message->req));
+		parcel_free_str_array(str_arr);
+		str_arr = NULL;
+		goto out;
+	}
+
+	g_ril_append_print_buf(gril, "{");
+
+	for (i = 0; i < str_arr->num_str; ++i) {
+		if (i + 1 == str_arr->num_str)
+			g_ril_append_print_buf(gril, "%s%s}", print_buf,
+						str_arr->str[i]);
+		else
+			g_ril_append_print_buf(gril, "%s%s, ", print_buf,
+						str_arr->str[i]);
+	}
+
+	g_ril_print_unsol(gril, message);
+
+out:
+	return str_arr;
+}

=== modified file 'drivers/mtkmodem/mtkunsol.h'
--- drivers/mtkmodem/mtkunsol.h	2015-01-28 07:52:19 +0000
+++ drivers/mtkmodem/mtkunsol.h	2015-04-06 14:34:59 +0000
@@ -45,6 +45,13 @@
 int g_mtk_unsol_parse_registration_suspended(GRil *gril,
 						const struct ril_msg *message);
 
+/*
+ * Returns a minimum of one PLMN or NULL. parcel_free_str_array must be invoked
+ * to free the returned pointer.
+ */
+struct parcel_str_array *g_mtk_unsol_parse_plmn_changed(GRil *gril,
+						const struct ril_msg *message);
+
 #ifdef __cplusplus
 }
 #endif

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

=== modified file 'gril/grilunsol.c'
--- gril/grilunsol.c	2014-08-14 15:14:18 +0000
+++ gril/grilunsol.c	2015-04-06 14:34:59 +0000
@@ -416,25 +416,80 @@
 	return radio_state;
 }
 
-inline static int is_valid_strength(int signal)
-{
-	if (signal != 99 && signal != -1)
-		return 1;
+/*
+ * This function makes a similar processing to was is done by validateInput()
+ * and getLteLevel() in $AOSP/frameworks/base/telephony/java/android/telephony/
+ * SignalStrength.java. The main difference is that we linearly transform the
+ * ranges to ofono's one, while AOSP gives number of bars in a non-linear way
+ * (bins for each bar have different size). We rely on the indicator to obtain
+ * a translation to bars that makes sense for humans.
+ */
+static int get_lte_strength(int signal, int rsrp, int rssnr)
+{
+	int s_rsrp = -1, s_rssnr = -1, s_signal = -1;
+
+	/*
+	 * The range of signal is specified to be [0, 31] by ril.h, but the code
+	 * in SignalStrength.java contradicts this: valid values are (0-63, 99)
+	 * as defined in TS 36.331 for E-UTRA rssi.
+	 */
+	signal = (signal >= 0 && signal <= 63) ? signal : INT_MAX;
+	rsrp = (rsrp >= 44 && rsrp <= 140) ? -rsrp : INT_MAX;
+	rssnr = (rssnr >= -200 && rssnr <= 300) ? rssnr : INT_MAX;
+
+	/* Linearly transform [-140, -44] to [0, 100] */
+	if (rsrp != INT_MAX)
+		s_rsrp = (25 * rsrp + 3500) / 24;
+
+	/* Linearly transform [-200, 300] to [0, 100] */
+	if (rssnr != INT_MAX)
+		s_rssnr = (rssnr + 200) / 5;
+
+	if (s_rsrp != -1 && s_rssnr != -1)
+		return s_rsrp < s_rssnr ? s_rsrp : s_rssnr;
+
+	if (s_rssnr != -1)
+		return s_rssnr;
+
+	if (s_rsrp != -1)
+		return s_rsrp;
+
+	/* Linearly transform [0, 63] to [0, 100] */
+	if (signal != INT_MAX)
+		s_signal = (100 * signal) / 63;
+
+	return s_signal;
+}
+
+/*
+ * Comments to get_lte_strength() apply here also, changing getLteLevel() with
+ * getGsmLevel(). The atmodem driver does exactly the same transformation with
+ * the rssi from AT+CSQ command.
+ */
+static int get_gsm_strength(int signal)
+{
+	/* Checking the range contemplates also the case signal=99 (invalid) */
+	if (signal >= 0 && signal <= 31)
+		return (signal * 100) / 31;
 	else
-		return 0;
+		return -1;
 }
 
 int g_ril_unsol_parse_signal_strength(GRil *gril, const struct ril_msg *message,
 					int ril_tech)
 {
 	struct parcel rilp;
-	int gw_signal, cdma_dbm, evdo_dbm, lte_signal, signal;
+	int gw_sigstr, gw_signal, cdma_dbm, evdo_dbm;
+	int lte_sigstr = -1, lte_rsrp = -1, lte_rssnr = -1;
+	int lte_signal;
+	int signal;
 
 	g_ril_init_parcel(message, &rilp);
 
 	/* RIL_SignalStrength_v5 */
 	/* GW_SignalStrength */
-	gw_signal = parcel_r_int32(&rilp);
+	gw_sigstr = parcel_r_int32(&rilp);
+	gw_signal = get_gsm_strength(gw_sigstr);
 	parcel_r_int32(&rilp); /* bitErrorRate */
 
 	/*
@@ -453,17 +508,20 @@
 	/* Present only for RIL_SignalStrength_v6 or newer */
 	if (parcel_data_avail(&rilp) > 0) {
 		/* LTE_SignalStrength */
-		lte_signal = parcel_r_int32(&rilp);
-		parcel_r_int32(&rilp); /* rsrp */
+		lte_sigstr = parcel_r_int32(&rilp);
+		lte_rsrp = parcel_r_int32(&rilp);
 		parcel_r_int32(&rilp); /* rsrq */
-		parcel_r_int32(&rilp); /* rssnr */
+		lte_rssnr = parcel_r_int32(&rilp);
 		parcel_r_int32(&rilp); /* cqi */
+		lte_signal = get_lte_strength(lte_sigstr, lte_rsrp, lte_rssnr);
 	} else {
 		lte_signal = -1;
 	}
 
-	g_ril_append_print_buf(gril, "{gw: %d, cdma: %d, evdo: %d, lte: %d}",
-				gw_signal, cdma_dbm, evdo_dbm, lte_signal);
+	g_ril_append_print_buf(gril,
+				"{gw: %d, cdma: %d, evdo: %d, lte: %d %d %d}",
+				gw_sigstr, cdma_dbm, evdo_dbm, lte_sigstr,
+				lte_rsrp, lte_rssnr);
 
 	if (message->unsolicited)
 		g_ril_print_unsol(gril, message);
@@ -471,19 +529,19 @@
 		g_ril_print_response(gril, message);
 
 	/* Return the first valid one */
-	if (is_valid_strength(gw_signal) && is_valid_strength(lte_signal))
+	if (gw_signal != -1 && lte_signal != -1)
 		if (ril_tech == RADIO_TECH_LTE)
 			signal = lte_signal;
 		else
 			signal = gw_signal;
-	else if (is_valid_strength(gw_signal))
+	else if (gw_signal != -1)
 		signal = gw_signal;
-	else if (is_valid_strength(lte_signal))
+	else if (lte_signal != -1)
 		signal = lte_signal;
 	else
-		return -1;
+		signal = -1;
 
-	return (signal * 100) / 31;
+	return signal;
 }
 
 void g_ril_unsol_free_supp_svc_notif(struct unsol_supp_svc_notif *unsol)

=== modified file 'include/modem.h'
--- include/modem.h	2014-09-16 07:59:58 +0000
+++ include/modem.h	2015-04-06 14:34:59 +0000
@@ -69,6 +69,9 @@
 
 	/* Populate the atoms available online */
 	void (*post_online)(struct ofono_modem *modem);
+
+	/* Is it a multi-SIM standby modem? */
+	ofono_bool_t (*is_standby)(struct ofono_modem *modem);
 };
 
 void ofono_modem_add_interface(struct ofono_modem *modem,
@@ -116,6 +119,8 @@
 					ofono_bool_t value);
 ofono_bool_t ofono_modem_get_driver_watches_sim(struct ofono_modem *modem);
 
+ofono_bool_t ofono_modem_is_standby(struct ofono_modem *modem);
+
 int ofono_modem_driver_register(const struct ofono_modem_driver *);
 void ofono_modem_driver_unregister(const struct ofono_modem_driver *);
 

=== modified file 'plugins/bluetooth.c'
--- plugins/bluetooth.c	2012-07-15 23:19:47 +0000
+++ plugins/bluetooth.c	2015-04-06 14:34:59 +0000
@@ -435,6 +435,14 @@
 		goto done;
 	}
 
+	/*
+	 * Adapter might have been removed before the callback, for instance in
+	 * case the SIM state changes due to a modem reset (see
+	 * hfp_ag.c:sim_state_watch())
+	 */
+	if (adapter_address_hash == NULL)
+		goto done;
+
 	DBG("");
 
 	bluetooth_parse_properties(reply,
@@ -900,7 +908,9 @@
 	g_dbus_remove_watch(connection, property_watch);
 
 	g_hash_table_destroy(uuid_hash);
+	uuid_hash = NULL;
 	g_hash_table_destroy(adapter_address_hash);
+	adapter_address_hash = NULL;
 }
 
 void bluetooth_get_properties()

=== modified file 'plugins/mtk.c'
--- plugins/mtk.c	2015-03-11 14:54:36 +0000
+++ plugins/mtk.c	2015-04-06 14:34:59 +0000
@@ -55,6 +55,7 @@
 #include <ofono/types.h>
 
 #include "ofono.h"
+#include <common.h>
 
 #include <gril.h>
 #include <grilreply.h>
@@ -91,10 +92,14 @@
 #define T_WAIT_DISCONN_MS 1000
 #define T_SIM_SWITCH_FAILSAFE_MS 1000
 
-enum mtk_sim_type {
-	MTK_SIM_TYPE_1 = 1,
-	MTK_SIM_TYPE_2 = 2,
-	MTK_SIM_TYPE_3 = 3
+#define INVALID_SUSPEND_ID -1
+#define T_FW_SWITCH_S 60
+
+enum mtk_plmn_type {
+	MTK_PLMN_TYPE_UNKNOWN = 0,
+	MTK_PLMN_TYPE_1,
+	MTK_PLMN_TYPE_2,
+	MTK_PLMN_TYPE_3
 };
 
 static const char hex_slot_0[] = "Slot 0: ";
@@ -136,6 +141,14 @@
 	int fw_type;
 	ofono_modem_online_cb_t online_cb;
 	void *online_data;
+	enum mtk_plmn_type sim_plmn_type;
+	enum mtk_plmn_type sensed_plmn_type;
+	int suspend_id;
+	ofono_bool_t trm_pending;
+	unsigned netreg_watch;
+	unsigned status_watch;
+	int netreg_status;
+	guint switch_fw_id;
 };
 
 /*
@@ -329,7 +342,7 @@
 	exec_online_callback(md);
 }
 
-static void reg_suspended_cb(struct ril_msg *message, gpointer user_data)
+static void resume_reg_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
 	struct mtk_data *md = ofono_modem_get_data(modem);
@@ -343,24 +356,21 @@
 	g_ril_print_response_no_args(md->ril, message);
 }
 
-static void reg_suspended(struct ril_msg *message, gpointer user_data)
+static void resume_reg(struct ofono_modem *modem)
 {
-	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__);
+	if (md->suspend_id == INVALID_SUSPEND_ID)
 		return;
-	}
 
-	g_mtk_request_resume_registration(md->ril, session_id, &rilp);
+	g_mtk_request_resume_registration(md->ril, md->suspend_id, &rilp);
 
 	if (g_ril_send(md->ril, MTK_RIL_REQUEST_RESUME_REGISTRATION, &rilp,
-			reg_suspended_cb, modem, NULL) == 0)
+			resume_reg_cb, modem, NULL) == 0)
 		ofono_error("%s: failure sending request", __func__);
+
+	md->suspend_id = INVALID_SUSPEND_ID;
 }
 
 static void sim_removed(struct ril_msg *message, gpointer user_data)
@@ -372,6 +382,8 @@
 
 	g_ril_print_unsol_no_args(md->ril, message);
 
+	md->sim_plmn_type = MTK_PLMN_TYPE_UNKNOWN;
+
 	ofono_modem_set_powered(modem, FALSE);
 	g_idle_add(mtk_connected, modem);
 }
@@ -403,16 +415,6 @@
 	}
 
 	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)
@@ -420,10 +422,12 @@
 	struct ofono_modem *modem = user_data;
 	struct mtk_data *md = ofono_modem_get_data(modem);
 	struct parcel rilp;
+	int trm = 0;
 
 	if (message->error != RIL_E_SUCCESS) {
 		ofono_error("%s: RIL error %s", __func__,
 				ril_error_to_string(message->error));
+		md->trm_pending = FALSE;
 		return;
 	}
 
@@ -431,13 +435,30 @@
 
 	/*
 	 * Send SET_TRM, which reloads the FW. We do not know the meaning of the
-	 * magic number 0x0B.
+	 * magic TRM numbers (no source code for muxreport daemon).
 	 */
-	g_mtk_request_set_trm(md->ril, 0x0B, &rilp);
+	if (md->fw_type == MTK_MD_TYPE_LWG) {
+		trm = 11;
+	} else if (md->fw_type == MTK_MD_TYPE_LTG) {
+		trm = 12;
+	} else {
+		ofono_error("%s: wrong modem type %d", __func__, md->fw_type);
+		g_assert(FALSE);
+	}
+
+	g_mtk_request_set_trm(md->ril, trm, &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__);
+
+	/*
+	 * rild will close now the socket, and the response to SET_TRM might be
+	 * received before that or not.
+	 * 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.
+	 */
 }
 
 static gboolean find_in_table(const char *str,
@@ -452,45 +473,65 @@
 	return FALSE;
 }
 
-static enum mtk_sim_type sim_type_for_fw_loading(const char *imsi)
+static enum mtk_plmn_type get_plmn_type(const char *code)
 {
-	/* China Mobile MCC/MNC codes */
+	/* China Mobile (CMCC) MCC/MNC codes */
 	const char *table_type1[] = { "46000", "46002", "46007" };
-	/* China Unicom and China Telecom MCC/MNC codes */
+	/* China Unicom (CU) 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;
+	if (find_in_table(code, table_type1, G_N_ELEMENTS(table_type1)))
+		return MTK_PLMN_TYPE_1;
+
+	if (find_in_table(code, table_type3, G_N_ELEMENTS(table_type3)))
+		return MTK_PLMN_TYPE_3;
+
+	return MTK_PLMN_TYPE_2;
 }
 
-static int sim_modem_fw(const char *imsi)
+static int select_modem_fw(enum mtk_plmn_type sim_plmn_type,
+				enum mtk_plmn_type sensed_plmn_type)
 {
-	enum mtk_sim_type sim_type;
-	int sim_fw = MTK_MD_TYPE_LWG;
+	DBG("PLMN (sim, sensed)=(%d, %d)", sim_plmn_type, sensed_plmn_type);
 
-	/* 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;
+	/*
+	 * Outside China (sensed t2) -> FDD always
+	 * In China (sensed t1, t3) -> sim t1 is TDD, t2 or t3 is FDD,
+	 *                             or wait for imsi to know sim type
+	 * Unknown country -> sim t2 or t3 are FDD, wait network if t1, wait
+	 *                    network/imsi events if both unknown
+	 */
+	switch (sensed_plmn_type) {
+	case MTK_PLMN_TYPE_2:
+		return MTK_MD_TYPE_LWG;
+	case MTK_PLMN_TYPE_1:
+	case MTK_PLMN_TYPE_3:
+		switch (sim_plmn_type) {
+			case MTK_PLMN_TYPE_1:
+				return MTK_MD_TYPE_LTG;
+			case MTK_PLMN_TYPE_2:
+			case MTK_PLMN_TYPE_3:
+				return MTK_MD_TYPE_LWG;
+			case MTK_PLMN_TYPE_UNKNOWN:
+				return MTK_MD_TYPE_INVALID;
+		};
+	case MTK_PLMN_TYPE_UNKNOWN:
+		switch (sim_plmn_type) {
+			case MTK_PLMN_TYPE_2:
+			case MTK_PLMN_TYPE_3:
+				return MTK_MD_TYPE_LWG;
+			case MTK_PLMN_TYPE_1:
+			case MTK_PLMN_TYPE_UNKNOWN:
+				return MTK_MD_TYPE_INVALID;
+		};
 	};
 
-	return sim_fw;
+	/* We should never arrive here */
+	ofono_error("%s: UNREACHABLE POINT REACHED, aborting", __func__);
+	g_assert(FALSE);
+
+	return MTK_MD_TYPE_INVALID;
 }
 
 static void set_fw_type(struct ofono_modem *modem, int type)
@@ -504,29 +545,210 @@
 	ofono_modem_set_boolean(modem, MODEM_PROP_LTE_CAPABLE, lte_cap);
 }
 
+static const char *fw_type_to_str(int fw_type)
+{
+	switch (fw_type) {
+	case MTK_MD_TYPE_2G:
+		return "2G";
+	case MTK_MD_TYPE_3G:
+		return "3G";
+	case MTK_MD_TYPE_WG:
+		return "WG";
+	case MTK_MD_TYPE_TG:
+		return "TG";
+	case MTK_MD_TYPE_LWG:
+		return "LWG";
+	case MTK_MD_TYPE_LTG:
+		return "LTG";
+	case MTK_MD_TYPE_LTNG:
+		return "LTNG";
+	}
+
+	return "<INVALID>";
+}
+
+static void switch_fw(struct ofono_modem *modem, int fw_type)
+{
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	struct parcel rilp;
+
+	ofono_info("Switching modem FW from %s to %s",
+			fw_type_to_str(md->fw_type), fw_type_to_str(fw_type));
+
+	md->trm_pending = TRUE;
+
+	set_fw_type(modem, fw_type);
+
+	g_mtk_request_store_modem_type(md->ril, fw_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__);
+		md->trm_pending = FALSE;
+	}
+}
+
 static void check_modem_fw(struct ofono_modem *modem)
 {
 	struct mtk_data *md = ofono_modem_get_data(modem);
-	int sim_type;
-	struct parcel rilp;
+	int best_fw;
 
 	/* 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__);
+	if (md->trm_pending) {
+		DBG("TRM pending, returning");
+		return;
+	}
+
+	/* Right modem fw type for our SIM/sensed PLMN */
+	best_fw = select_modem_fw(md->sim_plmn_type, md->sensed_plmn_type);
+
+	DBG("Modem type selected is %d", best_fw);
+
+	/* Best FW not known yet: wait for imsi/sensed network */
+	if (best_fw == MTK_MD_TYPE_INVALID)
+		return;
+
+	if (md->fw_type == best_fw) {
+		resume_reg(modem);
+		return;
+	}
+
+	/* We need to reload FW and reset transactionally */
+	switch_fw(modem, best_fw);
+}
+
+static void plmn_changed(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	struct parcel_str_array *plmns;
+
+	plmns = g_mtk_unsol_parse_plmn_changed(md->ril, message);
+	if (plmns == NULL) {
+		ofono_error("%s: parse error", __func__);
+		return;
+	}
+
+	md->sensed_plmn_type = get_plmn_type(plmns->str[0]);
+
+	DBG("Best PLMN is %s (type %d)", plmns->str[0], md->sensed_plmn_type);
+
+	parcel_free_str_array(plmns);
+
+	check_modem_fw(modem);
+}
+
+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);
+	int suspend_id;
+
+	suspend_id = g_mtk_unsol_parse_registration_suspended(md->ril, message);
+	if (suspend_id < 0) {
+		ofono_error("%s: parse error", __func__);
+		return;
+	}
+
+	md->suspend_id = suspend_id;
+
+	check_modem_fw(modem);
+}
+
+static gboolean tout_not_registered(gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+
+	if (md->trm_pending)
+		goto end;
+
+	DBG("type was %d", md->fw_type);
+
+	if (md->fw_type == MTK_MD_TYPE_LTG)
+		switch_fw(modem, MTK_MD_TYPE_LWG);
+	else
+		switch_fw(modem, MTK_MD_TYPE_LTG);
+
+end:
+	md->switch_fw_id = 0;
+
+	return FALSE;
+}
+
+static void cancel_fw_load_timer(struct mtk_data *md)
+{
+	if (md->switch_fw_id) {
+		g_source_remove(md->switch_fw_id);
+		md->switch_fw_id = 0;
+	}
+}
+
+static void netreg_status_update(struct ofono_modem *modem)
+{
+	struct mtk_data *md = ofono_modem_get_data(modem);
+
+	if (md->sim_plmn_type != MTK_PLMN_TYPE_1)
+		return;
+
+	if (md->fw_type != MTK_MD_TYPE_LTG && md->fw_type != MTK_MD_TYPE_LWG)
+		return;
+
+	DBG("%d", md->netreg_status);
+
+	if (md->switch_fw_id) {
+		if (md->netreg_status == NETWORK_REGISTRATION_STATUS_REGISTERED
+				|| md->netreg_status ==
+					NETWORK_REGISTRATION_STATUS_ROAMING)
+			cancel_fw_load_timer(md);
+		return;
+	}
+
+	if (md->netreg_status == NETWORK_REGISTRATION_STATUS_NOT_REGISTERED)
+		md->switch_fw_id = g_timeout_add_seconds(T_FW_SWITCH_S,
+						tout_not_registered, modem);
+}
+
+static void netreg_status_changed(int status, int lac, int ci, int tech,
+					const char *mcc, const char *mnc,
+					void *data)
+{
+	struct ofono_modem *modem = data;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+
+	if (md->netreg_status == status)
+		return;
+
+	md->netreg_status = status;
+
+	netreg_status_update(modem);
+}
+
+static void netreg_watch(struct ofono_atom *atom,
+				enum ofono_atom_watch_condition cond,
+				void *data)
+{
+	struct ofono_modem *modem = data;
+	struct mtk_data *md = ofono_modem_get_data(modem);
+	void *netreg;
+
+	DBG("%d", cond);
+
+	if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED) {
+		cancel_fw_load_timer(md);
+		md->status_watch = 0;
+		return;
+	}
+
+	netreg = __ofono_atom_get_data(atom);
+	md->netreg_status = ofono_netreg_get_status(netreg);
+	md->status_watch = __ofono_netreg_add_status_watch(netreg,
+					netreg_status_changed, modem, NULL);
+
+	netreg_status_update(modem);
 }
 
 static int mtk_probe(struct ofono_modem *modem)
@@ -540,6 +762,7 @@
 
 	md->ofono_online = FALSE;
 	md->radio_state = RADIO_STATE_UNAVAILABLE;
+	md->suspend_id = INVALID_SUSPEND_ID;
 
 	md->slot = ofono_modem_get_integer(modem, "Slot");
 
@@ -615,9 +838,7 @@
 
 		/*
 		 * TODO: this function should setup:
-		 *  - phonebook
 		 *  - stk ( SIM toolkit )
-		 *  - radio_settings
 		 */
 		md->sms = ofono_sms_create(modem, OFONO_RIL_VENDOR_MTK,
 						RILMODEM, md->ril);
@@ -665,8 +886,10 @@
 
 		/*
 		 * Now that we can access IMSI, see if a FW change is needed.
-		 * TODO: Roaming case and timeout case when no network is found.
 		 */
+
+	 	md->sim_plmn_type = get_plmn_type(ofono_sim_get_imsi(md->sim));
+
 		check_modem_fw(modem);
 
 	} else if (new_state == OFONO_SIM_STATE_LOCKED_OUT) {
@@ -728,6 +951,12 @@
 	/* Radio settings does not depend on the SIM */
 	ofono_radio_settings_create(modem, OFONO_RIL_VENDOR_MTK,
 					MTKMODEM, &rs_data);
+
+	if (md->netreg_watch == 0)
+		md->netreg_watch =
+			__ofono_modem_add_atom_watch(modem,
+						OFONO_ATOM_TYPE_NETREG,
+						netreg_watch, modem, NULL);
 }
 
 static void query_type_cb(struct ril_msg *message, gpointer user_data)
@@ -936,11 +1165,15 @@
 	if (message->error == RIL_E_SUCCESS) {
 		g_ril_print_response_no_args(md->ril, message);
 
-		if (disconnect_expected)
+		if (disconnect_expected) {
+			if (not_disconn_cb_id != 0)
+				g_source_remove(not_disconn_cb_id);
+
 			not_disconn_cb_id = g_timeout_add(T_WAIT_DISCONN_MS,
 						no_disconnect_case, cbd);
-		else
+		} else {
 			mtk_send_sim_mode(mtk_sim_mode_cb, cbd);
+		}
 	} else {
 		ofono_error("%s RADIO_POWERON error %s", __func__,
 				ril_error_to_string(message->error));
@@ -1072,7 +1305,9 @@
 			mtk_data_0->pending_cbd = cbd;
 		}
 	} else if (next_state == NO_SIM_ACTIVE) {
-		if (power_on_off(mtk_data_0->ril, FALSE, cbd))
+		/* Disconnection expected for dual SIM only */
+		if (power_on_off(mtk_data_0->ril, FALSE, cbd)
+				&& mtk_data_1 != NULL)
 			disconnect_expected = TRUE;
 	} else {
 		mtk_send_sim_mode(mtk_sim_mode_cb, cbd);
@@ -1272,6 +1507,14 @@
 	g_ril_unref(md->ril);
 	md->ril = NULL;
 
+	md->sensed_plmn_type = MTK_PLMN_TYPE_UNKNOWN;
+	md->suspend_id = INVALID_SUSPEND_ID;
+	if (md->trm_pending) {
+		md->ofono_online = FALSE;
+		ofono_modem_set_powered(md->modem, FALSE);
+		md->trm_pending = FALSE;
+	}
+
 	/* Disconnection happened so we do not call failsafe function */
 	if (not_disconn_cb_id != 0) {
 		g_source_remove(not_disconn_cb_id);
@@ -1338,6 +1581,8 @@
 				RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED,
 				radio_state_changed, sock);
 
+	g_ril_register(sock->ril, MTK_RIL_UNSOL_RESPONSE_PLMN_CHANGED,
+			plmn_changed, modem);
 	g_ril_register(sock->ril, MTK_RIL_UNSOL_RESPONSE_REGISTRATION_SUSPENDED,
 			reg_suspended, modem);
 
@@ -1414,6 +1659,11 @@
 	return 0;
 }
 
+static ofono_bool_t mtk_is_standby(struct ofono_modem *modem)
+{
+	return TRUE;
+}
+
 static struct ofono_modem_driver mtk_driver = {
 	.name = "mtk",
 	.probe = mtk_probe,
@@ -1424,6 +1674,7 @@
 	.post_sim = mtk_post_sim,
 	.post_online = mtk_post_online,
 	.set_online = mtk_set_online,
+	.is_standby = mtk_is_standby,
 };
 
 static int mtk_init(void)

=== modified file 'plugins/ubuntu-apndb.c'
--- plugins/ubuntu-apndb.c	2014-09-22 22:04:15 +0000
+++ plugins/ubuntu-apndb.c	2015-04-06 14:34:59 +0000
@@ -191,10 +191,14 @@
 	 * - mms
 	 */
 
-	if (g_strcmp0(types, "mms") == 0)
+	/* Default apns can be used for mms and ia, mms can be used for ia */
+	if (types == NULL || g_strcmp0(types, "*") == 0
+					|| strstr(types, "default") != NULL)
+		return OFONO_GPRS_CONTEXT_TYPE_INTERNET;
+	else if (strstr(types, "mms") != NULL)
 		return OFONO_GPRS_CONTEXT_TYPE_MMS;
-	else if (g_str_has_prefix(types, "default"))
-		return OFONO_GPRS_CONTEXT_TYPE_INTERNET;
+	else if (strstr(types, "ia") != NULL)
+		return OFONO_GPRS_CONTEXT_TYPE_IA;
 	else
 		return OFONO_GPRS_CONTEXT_TYPE_ANY;
 }
@@ -338,12 +342,6 @@
 		return;
 	}
 
-	if (types == NULL) {
-		ofono_error("%s: apn for %s missing type attribute", __func__,
-				carrier);
-		return;
-	}
-
 	if (protocol != NULL) {
 		if (g_strcmp0(protocol, "IP") == 0) {
 			proto = OFONO_GPRS_PROTO_IP;
@@ -401,7 +399,8 @@
 
 	if (type == OFONO_GPRS_CONTEXT_TYPE_ANY ||
 		(type == OFONO_GPRS_CONTEXT_TYPE_MMS && mmscenter == NULL)) {
-		DBG("Skipping %s context; types: %s", apn, types);
+		DBG("Skipping %s context; types: %s",
+					apn, types ? types : "(null)");
 		return;
 	}
 

=== modified file 'src/common.c'
--- src/common.c	2013-11-15 23:15:52 +0000
+++ src/common.c	2015-04-06 14:34:59 +0000
@@ -725,7 +725,7 @@
 	int i;
 	int last_period = 0;
 
-	if (apn[0] == '.' || apn[0] == '\0')
+	if (apn[0] == '.')
 		return FALSE;
 
 	for (i = 0; apn[i] != '\0'; i++) {

=== modified file 'src/gprs.c'
--- src/gprs.c	2015-02-04 00:09:22 +0000
+++ src/gprs.c	2015-04-06 14:34:59 +0000
@@ -124,6 +124,7 @@
 struct pri_context {
 	ofono_bool_t active;
 	enum ofono_gprs_context_type type;
+	gboolean preferred;
 	char name[MAX_CONTEXT_NAME_LENGTH + 1];
 	char message_proxy[MAX_MESSAGE_PROXY_LENGTH + 1];
 	char message_center[MAX_MESSAGE_CENTER_LENGTH + 1];
@@ -758,7 +759,7 @@
 	const char *type = gprs_context_type_to_string(ctx->type);
 	const char *proto = gprs_proto_to_string(ctx->context.proto);
 	const char *name = ctx->name;
-	dbus_bool_t value;
+	dbus_bool_t value, preferred;
 	const char *strvalue;
 	struct context_settings *settings;
 
@@ -767,6 +768,9 @@
 	value = ctx->active;
 	ofono_dbus_dict_append(dict, "Active", DBUS_TYPE_BOOLEAN, &value);
 
+	preferred = ctx->preferred;
+	ofono_dbus_dict_append(dict, "Preferred", DBUS_TYPE_BOOLEAN, &preferred);
+
 	ofono_dbus_dict_append(dict, "Type", DBUS_TYPE_STRING, &type);
 
 	ofono_dbus_dict_append(dict, "Protocol", DBUS_TYPE_STRING, &proto);
@@ -892,6 +896,33 @@
 					"Active", DBUS_TYPE_BOOLEAN, &value);
 }
 
+static DBusMessage *pri_set_preferred(struct pri_context *ctx,
+					DBusConnection *conn,
+					DBusMessage *msg, gboolean preferred)
+{
+	GKeyFile *settings = ctx->gprs->settings;
+
+	if (ctx->preferred == preferred)
+		return dbus_message_new_method_return(msg);
+
+	ctx->preferred = preferred;
+
+	if (settings) {
+		g_key_file_set_boolean(settings, ctx->key, "Preferred",
+								preferred);
+		storage_sync(ctx->gprs->imsi, SETTINGS_STORE, settings);
+	}
+
+	g_dbus_send_reply(conn, msg, DBUS_TYPE_INVALID);
+
+	ofono_dbus_signal_property_changed(conn, ctx->path,
+					OFONO_CONNECTION_CONTEXT_INTERFACE,
+					"Preferred", DBUS_TYPE_BOOLEAN,
+					&preferred);
+
+	return NULL;
+}
+
 static DBusMessage *pri_set_apn(struct pri_context *ctx, DBusConnection *conn,
 				DBusMessage *msg, const char *apn)
 {
@@ -1190,6 +1221,15 @@
 		return NULL;
 	}
 
+	if (!strcmp(property, "Preferred")) {
+		if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_BOOLEAN)
+			return __ofono_error_invalid_args(msg);
+
+		dbus_message_iter_get_basic(&var, &value);
+
+		return pri_set_preferred(ctx, conn, msg, value);
+	}
+
 	/* All other properties are read-only when context is active */
 	if (ctx->active == TRUE)
 		return __ofono_error_in_use(msg);
@@ -1593,6 +1633,58 @@
 	gprs_netreg_update(gprs);
 }
 
+static void notify_connection_powered(struct ofono_modem *modem, void *data)
+{
+	struct ofono_atom *atom;
+	struct ofono_gprs *gprs;
+	struct ofono_modem *modem_notif = data;
+	DBusConnection *conn;
+	const char *path = ofono_modem_get_path(modem);
+
+	if (strcmp(path, ofono_modem_get_path(modem_notif)) == 0)
+		return;
+
+	if (!ofono_modem_is_standby(modem))
+		return;
+
+	atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_GPRS);
+	if (atom == NULL)
+		return;
+
+	gprs = __ofono_atom_get_data(atom);
+
+	if (gprs->driver->set_attached == NULL)
+		return;
+
+	if (gprs->powered == FALSE)
+		return;
+
+	gprs->powered = FALSE;
+
+	if (gprs->settings) {
+		g_key_file_set_integer(gprs->settings, SETTINGS_GROUP,
+					"Powered", gprs->powered);
+		storage_sync(gprs->imsi, SETTINGS_STORE, gprs->settings);
+	}
+
+	gprs_netreg_update(gprs);
+
+	conn = ofono_dbus_get_connection();
+	ofono_dbus_signal_property_changed(conn, path,
+					OFONO_CONNECTION_MANAGER_INTERFACE,
+					"Powered", DBUS_TYPE_BOOLEAN,
+					&gprs->powered);
+}
+
+static void notify_powered_change(struct ofono_gprs *gprs)
+{
+	if (gprs->powered) {
+		struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
+
+		__ofono_modem_foreach(notify_connection_powered, modem);
+	}
+}
+
 static DBusMessage *gprs_get_properties(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
@@ -1709,6 +1801,8 @@
 		}
 
 		gprs_netreg_update(gprs);
+
+		notify_powered_change(gprs);
 	} else {
 		return __ofono_error_invalid_args(msg);
 	}
@@ -1736,6 +1830,8 @@
 				gprs_context_type_to_string(context->type));
 	g_key_file_set_string(gprs->settings, context->key, "Protocol",
 				gprs_proto_to_string(context->context.proto));
+	g_key_file_set_boolean(gprs->settings, context->key, "Preferred",
+				context->preferred);
 
 	if (context->type == OFONO_GPRS_CONTEXT_TYPE_MMS ||
 		(context->message_center && strlen(context->message_center) > 0)) {
@@ -2690,6 +2786,7 @@
 	char *msgcenter = NULL;
 	gboolean ret = FALSE;
 	gboolean legacy = FALSE;
+	gboolean preferred;
 	struct pri_context *context;
 	enum ofono_gprs_context_type type;
 	enum ofono_gprs_proto proto;
@@ -2724,6 +2821,9 @@
 	if (gprs_proto_from_string(protostr, &proto) == FALSE)
 		goto error;
 
+	preferred = g_key_file_get_boolean(gprs->settings, group,
+							"Preferred", NULL);
+
 	username = g_key_file_get_string(gprs->settings, group,
 						"Username", NULL);
 	if (username == NULL)
@@ -2775,6 +2875,7 @@
 	strcpy(context->context.password, password);
 	strcpy(context->context.apn, apn);
 	context->context.proto = proto;
+	context->preferred = preferred;
 
 	if (msgproxy != NULL)
 		strcpy(context->message_proxy, msgproxy);
@@ -2838,6 +2939,8 @@
 					"Powered", gprs->powered);
 	}
 
+	notify_powered_change(gprs);
+
 	error = NULL;
 	gprs->roaming_allowed = g_key_file_get_boolean(gprs->settings,
 							SETTINGS_GROUP,

=== modified file 'src/modem.c'
--- src/modem.c	2015-01-29 13:48:44 +0000
+++ src/modem.c	2015-04-06 14:34:59 +0000
@@ -2256,3 +2256,11 @@
 out:
 	modem->emergency--;
 }
+
+ofono_bool_t ofono_modem_is_standby(struct ofono_modem *modem)
+{
+	if (modem->driver->is_standby == NULL)
+		return FALSE;
+
+	return modem->driver->is_standby(modem);
+}

=== modified file 'unit/test-common.c'
--- unit/test-common.c	2011-10-10 20:40:17 +0000
+++ unit/test-common.c	2015-04-06 14:34:59 +0000
@@ -146,6 +146,7 @@
 	"wap.cingular",
 	"vodafone.co.uk",
 	"vodafone.com",
+	"",
 	NULL
 };
 
@@ -154,7 +155,6 @@
 	"..",
 	"f..f",
 	"foo.bar.#",
-	"",
 	NULL
 };
 

=== modified file 'unit/test-mtkunsol.c'
--- unit/test-mtkunsol.c	2015-01-28 07:52:59 +0000
+++ unit/test-mtkunsol.c	2015-04-06 14:34:59 +0000
@@ -92,6 +92,44 @@
 	.error = 0,
 };
 
+/*
+ * The following hexadecimal data represents a serialized Binder parcel instance
+ * containing a valid MTK_RIL_UNSOL_RESPONSE_PLMN_CHANGED message with the
+ * following parameters:
+ *
+ * {21401}
+ */
+static const guchar unsol_plmn_changed_parcel1[] = {
+	0x01, 0x00, 0x00, 0x00,	0x05, 0x00, 0x00, 0x00, 0x32, 0x00, 0x31, 0x00,
+	0x34, 0x00, 0x30, 0x00, 0x31, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg unsol_plmn_changed_valid_1 = {
+	.buf = (gchar *) &unsol_plmn_changed_parcel1,
+	.buf_len = sizeof(unsol_plmn_changed_parcel1),
+	.unsolicited = TRUE,
+	.req = MTK_RIL_UNSOL_RESPONSE_PLMN_CHANGED,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data represents a serialized Binder parcel instance
+ * containing a MTK_RIL_UNSOL_RESPONSE_PLMN_CHANGED message with no strings.
+ */
+static const guchar unsol_plmn_changed_parcel2[] = {
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg unsol_plmn_changed_invalid_1 = {
+	.buf = (gchar *) &unsol_plmn_changed_parcel2,
+	.buf_len = sizeof(unsol_plmn_changed_parcel2),
+	.unsolicited = TRUE,
+	.req = MTK_RIL_UNSOL_RESPONSE_PLMN_CHANGED,
+	.serial_no = 0,
+	.error = 0,
+};
+
 static void test_unsol_incoming_call_indication_valid(gconstpointer data)
 {
 	struct unsol_call_indication *unsol;
@@ -113,6 +151,25 @@
 	g_assert(suspended > 0);
 }
 
+static void test_unsol_plmn_changed_valid(gconstpointer data)
+{
+	struct parcel_str_array *plmns;
+
+	plmns = g_mtk_unsol_parse_plmn_changed(NULL, (struct ril_msg *) data);
+
+	g_assert(plmns != NULL);
+	parcel_free_str_array(plmns);
+}
+
+static void test_unsol_plmn_changed_invalid(gconstpointer data)
+{
+	struct parcel_str_array *plmns;
+
+	plmns = g_mtk_unsol_parse_plmn_changed(NULL, (struct ril_msg *) data);
+
+	g_assert(plmns == NULL);
+}
+
 #endif	/* LITTLE_ENDIAN */
 
 int main(int argc, char **argv)
@@ -137,6 +194,16 @@
 				&unsol_registration_suspended_valid_1,
 				test_unsol_registration_suspended_valid);
 
+	g_test_add_data_func("/testmtkunsol/fw: "
+				"valid RESPONSE_PLMN_CHANGED Test 1",
+				&unsol_plmn_changed_valid_1,
+				test_unsol_plmn_changed_valid);
+
+	g_test_add_data_func("/testmtkunsol/fw: "
+				"invalid RESPONSE_PLMN_CHANGED Test 1",
+				&unsol_plmn_changed_invalid_1,
+				test_unsol_plmn_changed_invalid);
+
 #endif	/* LITTLE_ENDIAN */
 
 	return g_test_run();