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

[Tony Espy]

[ Alfonso Sanchez-Beato ]
  * rilmodem/sim.c, plugins/mtk.c, ril.c: fix SIM interface signals (LP: #1376250)

  * Makefile.am, doc/mtk-settings-api.txt, mtkmodem,
    plugins/mtk.c, test, unit: support krillin 3g slot switch (LP: #1373388)

This merge includes fixes for two ofono bugs:

- fix SIM interface signals ( lp: #1376250 )

This fix also is thought to have bearing on a dialer/messaging app bug ( lp: #1379836 ), although as this is conjecture, the fix isn't included in the changelog.

- support krillin 3g slot switch ( lp: #1373388 )

Only the second bug is slated for ww51-2014, however this change is dependent on the earlier bug fix for the SIM interface signals.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[Tony Espy (awe)]

We decided to pull the Set3G code for RTM, and just land the auto-answer code, so I've marked this MP as "work-in-progress".

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

6884. By Alfonso Sanchez-Beato on 2015-01-21

[ Alfonso Sanchez-Beato ]
* rilmodem, mtkmodem, plugins/ril.c,mtk.c: Auto-answer calls when test SIM is present.
Approved by: Tony Espy

6885. By CI Train Bot Account on 2015-01-21

Releasing 1.12.bzr6884+15.04.20150121.1~rtm-0ubuntu1

6886. By Alfonso Sanchez-Beato on 2015-02-06

[ Alfonso Sanchez-Beato ]
* rilmodem/sim.c, plugins/mtk.c, ril.c: fix SIM interface signals (LP: #1376250)
* Makefile.am, doc/mtk-settings-api.txt, mtkmodem,
  plugins/mtk.c, test, unit: support krillin 3g slot switch (LP: #1373388)

=== modified file 'Makefile.am'
--- Makefile.am	2014-07-29 21:21:56 +0000
+++ Makefile.am	2015-02-06 15:08:43 +0000
@@ -146,7 +146,8 @@
 			drivers/mtkmodem/mtkreply.c \
 			drivers/mtkmodem/voicecall.c \
 			drivers/mtkmodem/gprs.c \
-			drivers/mtkmodem/radio-settings.c
+			drivers/mtkmodem/radio-settings.c \
+			drivers/mtkmodem/mtksettings.c
 
 builtin_modules += rilmodem
 builtin_sources += drivers/rilmodem/rilmodem.h \

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-21 18:07:49 +0000
+++ debian/changelog	2015-02-06 15:08:43 +0000
@@ -1,3 +1,13 @@
+ofono (1.12.bzr6886+15.04.20150206~rtm-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Alfonso Sanchez-Beato ]
+  * rilmodem/sim.c, plugins/mtk.c, ril.c: fix SIM interface signals (LP: #1376250)
+
+  * Makefile.am, doc/mtk-settings-api.txt, mtkmodem,
+    plugins/mtk.c, test, unit: support krillin 3g slot switch (LP: #1373388)
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Fri, 06 Feb 2015 16:03:05 +0100
+
 ofono (1.12.bzr6884+15.04.20150121.1~rtm-0ubuntu1) 14.09; urgency=medium
 
   [ Alfonso Sanchez-Beato ]

=== added file 'doc/mtk-settings-api.txt'
--- doc/mtk-settings-api.txt	1970-01-01 00:00:00 +0000
+++ doc/mtk-settings-api.txt	2015-02-06 15:08:43 +0000
@@ -0,0 +1,49 @@
+MediaTek settings hierarchy
+===========================
+
+Service		org.ofono
+Interface	org.ofono.MtkSettings
+Object path	[variable prefix]/{modem0,modem1,...}
+
+Methods		dict GetProperties()
+
+			Returns all MtkSettings properties. See the
+			properties section for available properties.
+
+			Possible Errors: [service].Error.InProgress
+					 [service].Error.NotImplemented
+					 [service].Error.Failed
+
+		void SetProperty(string name, variant value)
+
+			Changes the value of the specified property. Only
+			properties that are listed as readwrite are
+			changeable. On success a PropertyChanged signal
+			will be emitted.
+
+			Possible Errors: [service].Error.InProgress
+					 [service].Error.NotImplemented
+					 [service].Error.InvalidArguments
+					 [service].Error.Failed
+
+Signals		PropertyChanged(string property, variant value)
+
+			This signal indicates a changed value of the given
+			property.
+
+Properties	boolean Has3G [readwrite]
+
+			If true, the modem has 3G capabilities, otherwise it is
+			just 2G. Only one of the modems can have this set at a
+			time (note that in fact the modem hardware is shared
+			among all ofono MTK modems, and that each ofono MTK
+			modem represents one physical slot in the phone).
+
+			When we set the property to TRUE, all MTK modems are
+			reset, and after that this property will be false for
+			all modems except for the one for which we set the
+			property. Note that setting this property to FALSE is
+			not allowed to avoid confusion, as one and only one of
+			the modems must have it set to true and we can have
+			the case of more than two modems.
+

=== modified file 'drivers/mtkmodem/mtk_constants.h'
--- drivers/mtkmodem/mtk_constants.h	2014-07-28 07:12:26 +0000
+++ drivers/mtkmodem/mtk_constants.h	2015-02-06 15:08:43 +0000
@@ -30,6 +30,7 @@
 #define MTK_RIL_REQUEST_RADIO_POWERON 2033
 #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_FD_MODE 2073
 
 /* RIL Unsolicited Messages */

=== modified file 'drivers/mtkmodem/mtkreply.c'
--- drivers/mtkmodem/mtkreply.c	2014-07-24 08:31:18 +0000
+++ drivers/mtkmodem/mtkreply.c	2015-02-06 15:08:43 +0000
@@ -35,7 +35,7 @@
 					const struct ril_msg *message)
 {
 	struct parcel rilp;
-	int sim_3g, numint, slot;
+	int slot_3g, numint;
 
 	g_ril_init_parcel(message, &rilp);
 
@@ -49,19 +49,18 @@
 	 * Bitmap with 3g capability per slot. Reply is the same regardless of
 	 * the socket used to sent the request.
 	 */
-	sim_3g = parcel_r_int32(&rilp);
+	slot_3g = parcel_r_int32(&rilp);
 
 	if (rilp.malformed) {
 		ofono_error("%s: malformed parcel", __func__);
 		goto error;
 	}
 
-	g_ril_append_print_buf(gril, "{%d}", sim_3g);
+	g_ril_append_print_buf(gril, "{%d}", slot_3g);
 	g_ril_print_response(gril, message);
 
-	slot = g_ril_get_slot(gril);
-
-	return (sim_3g >> slot) & 0x01;
+	/* Do it zero-based */
+	return slot_3g - 1;
 
 error:
 	return -1;

=== modified file 'drivers/mtkmodem/mtkrequest.c'
--- drivers/mtkmodem/mtkrequest.c	2014-06-12 10:49:29 +0000
+++ drivers/mtkmodem/mtkrequest.c	2015-02-06 15:08:43 +0000
@@ -122,3 +122,14 @@
 		g_ril_append_print_buf(gril, "%s)", print_buf);
 	}
 }
+
+void g_mtk_request_set_3g_capability(GRil *gril, struct parcel *rilp)
+{
+	int mode = g_ril_get_slot(gril) + 1;
+
+	parcel_init(rilp);
+	parcel_w_int32(rilp, 1);
+	parcel_w_int32(rilp, mode);
+
+	g_ril_append_print_buf(gril, "(%d)", mode);
+}

=== modified file 'drivers/mtkmodem/mtkrequest.h'
--- drivers/mtkmodem/mtkrequest.h	2014-06-12 10:49:29 +0000
+++ drivers/mtkmodem/mtkrequest.h	2015-02-06 15:08:43 +0000
@@ -102,6 +102,12 @@
 void g_mtk_request_set_fd_mode(GRil *gril, int mode, int param1,
 					int param2, struct parcel *rilp);
 
+/*
+ * Sets the slot to which the GRil object is connected as the one with 3G
+ * capabilities. This makes the other slot just 2G.
+ */
+void g_mtk_request_set_3g_capability(GRil *gril, struct parcel *rilp);
+
 #ifdef __cplusplus
 }
 #endif

=== added file 'drivers/mtkmodem/mtksettings.c'
--- drivers/mtkmodem/mtksettings.c	1970-01-01 00:00:00 +0000
+++ drivers/mtkmodem/mtksettings.c	2015-02-06 15:08:43 +0000
@@ -0,0 +1,261 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  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
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <glib.h>
+#include <gdbus.h>
+#include <ofono.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/dbus.h>
+
+#include "drivers/mtkmodem/mtk_constants.h"
+#include "drivers/mtkmodem/mtkrequest.h"
+#include "drivers/mtkmodem/mtkutil.h"
+#include "mtksettings.h"
+
+#define MTK_SETTINGS_INTERFACE "org.ofono.MtkSettings"
+
+struct mtk_settings_data {
+	struct ofono_modem *modem;
+	GRil *ril;
+	ofono_bool_t has_3g;
+	ofono_bool_t has_3g_pending;
+	DBusMessage *pending;
+};
+
+static void set_3g(struct mtk_settings_data *msd, ofono_bool_t has_3g)
+{
+	DBusConnection *conn = ofono_dbus_get_connection();
+	const char *path = ofono_modem_get_path(msd->modem);
+	dbus_bool_t value = has_3g;
+
+	if (msd->has_3g == has_3g)
+		return;
+
+	ofono_dbus_signal_property_changed(conn, path, MTK_SETTINGS_INTERFACE,
+						"Has3G", DBUS_TYPE_BOOLEAN,
+						&value);
+	msd->has_3g = has_3g;
+}
+
+static void set_3g_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct mtk_settings_data *msd = user_data;
+	DBusMessage *reply;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: Error setting 3G", __func__);
+
+		msd->has_3g_pending = msd->has_3g;
+
+		reply = __ofono_error_failed(msd->pending);
+		__ofono_dbus_pending_reply(&msd->pending, reply);
+
+		return;
+	}
+
+	g_ril_print_response_no_args(msd->ril, message);
+
+	reply = dbus_message_new_method_return(msd->pending);
+	__ofono_dbus_pending_reply(&msd->pending, reply);
+
+	set_3g(msd, msd->has_3g_pending);
+
+	mtk_reset_all_modems();
+}
+
+static DBusMessage *set_property(DBusConnection *conn, DBusMessage *msg,
+					void *data)
+{
+	struct mtk_settings_data *msd = data;
+	DBusMessageIter iter;
+	DBusMessageIter var;
+	const char *property;
+
+	if (msd->pending)
+		return __ofono_error_busy(msg);
+
+	if (!dbus_message_iter_init(msg, &iter))
+		return __ofono_error_invalid_args(msg);
+
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+		return __ofono_error_invalid_args(msg);
+
+	dbus_message_iter_get_basic(&iter, &property);
+	dbus_message_iter_next(&iter);
+
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+		return __ofono_error_invalid_args(msg);
+
+	dbus_message_iter_recurse(&iter, &var);
+
+	if (g_strcmp0(property, "Has3G") == 0) {
+		dbus_bool_t value;
+		struct parcel rilp;
+
+		if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_BOOLEAN)
+			return __ofono_error_invalid_args(msg);
+
+		dbus_message_iter_get_basic(&var, &value);
+
+		if (msd->has_3g_pending == (ofono_bool_t) value)
+			return dbus_message_new_method_return(msg);
+
+		/*
+		 * We can only set to true, as setting to false could be
+		 * confusing in a multi-sim environment (>2 SIM)
+		 */
+		if (value == FALSE)
+			return __ofono_error_invalid_args(msg);
+
+		g_mtk_request_set_3g_capability(msd->ril, &rilp);
+
+		if (g_ril_send(msd->ril, MTK_RIL_REQUEST_SET_3G_CAPABILITY,
+				&rilp, set_3g_cb, msd, NULL) == 0) {
+			ofono_error("%s: unable to set 3G for slot", __func__);
+			return __ofono_error_failed(msg);
+		}
+
+		msd->pending = dbus_message_ref(msg);
+		msd->has_3g_pending = value;
+
+		return NULL;
+	}
+
+	return __ofono_error_invalid_args(msg);
+}
+
+static DBusMessage *get_properties(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	struct mtk_settings_data *msd = data;
+	DBusMessage *reply;
+	DBusMessageIter iter;
+	DBusMessageIter dict;
+
+	reply = dbus_message_new_method_return(msg);
+	if (reply == NULL)
+		return NULL;
+
+	dbus_message_iter_init_append(reply, &iter);
+
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+					OFONO_PROPERTIES_ARRAY_SIGNATURE,
+					&dict);
+
+	ofono_dbus_dict_append(&dict, "Has3G",
+				DBUS_TYPE_BOOLEAN, &msd->has_3g);
+
+	dbus_message_iter_close_container(&iter, &dict);
+
+	return reply;
+}
+
+static const GDBusMethodTable mtk_settings_methods[] = {
+	{ GDBUS_ASYNC_METHOD("GetProperties",
+			NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+			get_properties) },
+	{ GDBUS_ASYNC_METHOD("SetProperty",
+			GDBUS_ARGS({ "property", "s" }, { "value", "v" }),
+			NULL, set_property) },
+	{ }
+};
+
+static const GDBusSignalTable mtk_settings_signals[] = {
+	{ GDBUS_SIGNAL("PropertyChanged",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+	{ }
+};
+
+
+static void register_interface(struct mtk_settings_data *msd)
+{
+	DBusConnection *conn = ofono_dbus_get_connection();
+
+	if (!g_dbus_register_interface(conn, ofono_modem_get_path(msd->modem),
+					MTK_SETTINGS_INTERFACE,
+					mtk_settings_methods,
+					mtk_settings_signals,
+					NULL, msd, NULL)) {
+		ofono_error("Could not create %s interface",
+				MTK_SETTINGS_INTERFACE);
+		return;
+	}
+
+	ofono_modem_add_interface(msd->modem, MTK_SETTINGS_INTERFACE);
+}
+
+static void unregister_interface(struct mtk_settings_data *msd)
+{
+	DBusConnection *conn = ofono_dbus_get_connection();
+
+	ofono_modem_remove_interface(msd->modem, MTK_SETTINGS_INTERFACE);
+
+	g_dbus_unregister_interface(conn,
+					ofono_modem_get_path(msd->modem),
+					MTK_SETTINGS_INTERFACE);
+}
+
+struct mtk_settings_data *mtk_settings_create(struct ofono_modem *modem,
+						GRil *ril, ofono_bool_t has_3g)
+{
+	struct mtk_settings_data *msd = g_try_malloc0(sizeof(*msd));
+
+	DBG("");
+
+	if (msd == NULL) {
+		ofono_error("%s: Cannot allocate mtk_settings_data", __func__);
+		return NULL;
+	}
+
+	msd->modem = modem;
+	msd->ril = g_ril_clone(ril);
+
+	msd->has_3g = has_3g;
+	msd->has_3g_pending = has_3g;
+
+	register_interface(msd);
+
+	return msd;
+}
+
+void mtk_settings_remove(struct mtk_settings_data *msd)
+{
+	DBG("");
+
+	if (msd == NULL)
+		return;
+
+	unregister_interface(msd);
+
+	g_ril_unref(msd->ril);
+	g_free(msd);
+}

=== added file 'drivers/mtkmodem/mtksettings.h'
--- drivers/mtkmodem/mtksettings.h	1970-01-01 00:00:00 +0000
+++ drivers/mtkmodem/mtksettings.h	2015-02-06 15:08:43 +0000
@@ -0,0 +1,43 @@
+/*
+ *
+ *  MTK driver for ofono/rilmodem
+ *
+ *  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
+ *
+ */
+
+#ifndef MTKSETTINGS_H
+#define MTKSETTINGS_H
+
+#include <ofono/types.h>
+
+#include "gril.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct mtk_settings_data;
+
+struct mtk_settings_data *mtk_settings_create(struct ofono_modem *modem,
+						GRil *ril, ofono_bool_t has_3g);
+void mtk_settings_remove(struct mtk_settings_data *msd);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MTKSETTINGS_H */

=== modified file 'drivers/mtkmodem/mtkutil.c'
--- drivers/mtkmodem/mtkutil.c	2014-07-28 07:12:26 +0000
+++ drivers/mtkmodem/mtkutil.c	2015-02-06 15:08:43 +0000
@@ -41,6 +41,8 @@
 		return "MTK_RIL_REQUEST_SET_CALL_INDICATION";
 	case MTK_RIL_REQUEST_GET_3G_CAPABILITY:
 		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_FD_MODE:
 		return "MTK_RIL_REQUEST_SET_FD_MODE";
 	default:

=== modified file 'drivers/mtkmodem/mtkutil.h'
--- drivers/mtkmodem/mtkutil.h	2014-07-31 06:45:32 +0000
+++ drivers/mtkmodem/mtkutil.h	2015-02-06 15:08:43 +0000
@@ -34,6 +34,8 @@
 void mtk_set_attach_state(struct ofono_modem *modem, ofono_bool_t attached);
 void mtk_detach_received(struct ofono_modem *modem);
 
+void mtk_reset_all_modems(void);
+
 struct mtk_gprs_data {
 	GRil *gril;
 	struct ofono_modem *modem;

=== modified file 'drivers/mtkmodem/radio-settings.c'
--- drivers/mtkmodem/radio-settings.c	2014-09-25 12:16:25 +0000
+++ drivers/mtkmodem/radio-settings.c	2015-02-06 15:08:43 +0000
@@ -132,7 +132,7 @@
 	struct radio_data *rd = ofono_radio_settings_get_data(rs);
 	ofono_radio_settings_modem_rats_query_cb_t cb = cbd->cb;
 	ofono_bool_t modem_rats[OFONO_RADIO_ACCESS_MODE_LAST] = { FALSE };
-	int is_3g;
+	int slot_3g, is_3g;
 
 	if (message->error != RIL_E_SUCCESS) {
 		ofono_error("%s: error %s", __func__,
@@ -141,13 +141,15 @@
 		return;
 	}
 
-	is_3g = g_mtk_reply_parse_get_3g_capability(rd->ril, message);
-	if (is_3g < 0) {
+	slot_3g = g_mtk_reply_parse_get_3g_capability(rd->ril, message);
+	if (slot_3g < 0) {
 		ofono_error("%s: parse error", __func__);
 		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 		return;
 	}
 
+	is_3g = (g_ril_get_slot(rd->ril) == slot_3g);
+
 	modem_rats[OFONO_RADIO_ACCESS_MODE_GSM] = TRUE;
 
 	if (is_3g) {

=== modified file 'drivers/rilmodem/radio-settings.c'
--- drivers/rilmodem/radio-settings.c	2014-07-24 08:31:18 +0000
+++ drivers/rilmodem/radio-settings.c	2015-02-06 15:08:43 +0000
@@ -118,8 +118,16 @@
 		return;
 	}
 
+	/*
+	 * GSM_WCDMA_AUTO -> ril.h: GSM/WCDMA (auto mode, according to PRL)
+	 * PRL: preferred roaming list.
+	 * This value is returned when selecting the slot as having 3G
+	 * capabilities, so it is sort of the default for MTK modems.
+	 */
+
 	switch (pref) {
 	case PREF_NET_TYPE_GSM_WCDMA:
+	case PREF_NET_TYPE_GSM_WCDMA_AUTO:
 		mode = OFONO_RADIO_ACCESS_MODE_UMTS;
 		break;
 	case PREF_NET_TYPE_GSM_ONLY:

=== modified file 'drivers/rilmodem/sim.c'
--- drivers/rilmodem/sim.c	2014-10-10 02:10:48 +0000
+++ drivers/rilmodem/sim.c	2015-02-06 15:08:43 +0000
@@ -85,7 +85,6 @@
 	guint app_type;
 	gchar *app_str;
 	guint app_index;
-	gboolean sim_registered;
 	enum ofono_sim_password_type passwd_type;
 	int retries[OFONO_SIM_PASSWORD_INVALID];
 	enum ofono_sim_password_type passwd_state;
@@ -646,55 +645,56 @@
 	struct ofono_sim *sim = user_data;
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct reply_sim_status *status;
-	guint i = 0;
-	guint search_index = -1;
-
-	if (sd->sim_registered == FALSE) {
-		/* First status request, after sim_probe() */
-		ofono_sim_register(sim);
-		sd->sim_registered = TRUE;
-
-		if (sd->ril_state_watch != NULL &&
-				!ofono_sim_add_state_watch(sim,
-						sd->ril_state_watch,
-						sd->modem, NULL))
-			ofono_error("Error registering ril sim watch");
+	guint search_index;
+
+	status = g_ril_reply_parse_sim_status(sd->ril, message);
+	if (status == NULL) {
+		ofono_error("%s: Cannot parse SIM status reply", __func__);
+		return;
 	}
 
-	if ((status = g_ril_reply_parse_sim_status(sd->ril, message))
-			!= NULL
-			&& status->card_state == RIL_CARDSTATE_PRESENT
-			&& status->num_apps) {
-
-		DBG("num_apps: %d gsm_umts_index: %d", status->num_apps,
-			status->gsm_umts_index);
-
-		/*
-		 * TODO(CDMA): need some kind of logic to
-		 * set the correct app_index,
-		 */
-		search_index = status->gsm_umts_index;
-
-		for (i = 0; i < status->num_apps; i++) {
-			struct reply_sim_app *app = status->apps[i];
-			if (i == search_index &&
-					app->app_type != RIL_APPTYPE_UNKNOWN) {
-				configure_active_app(sd, app, i);
-				break;
-			}
-		}
-
-		/*
-		 * Note: There doesn't seem to be any other way to
-		 * force the core SIM code to recheck the PIN. This
-		 * call causes the core to call the this atom's
-		 * query_passwd() function.
-		 */
-		__ofono_sim_recheck_pin(sim);
-
-	} else if (status && status->card_state == RIL_CARDSTATE_ABSENT) {
-		ofono_info("SIM card absent");
+	DBG("SIM status is %u", status->card_state);
+
+	if (status->card_state == RIL_CARDSTATE_PRESENT)
+		ofono_sim_inserted_notify(sim, TRUE);
+	else if (status && status->card_state == RIL_CARDSTATE_ABSENT)
 		ofono_sim_inserted_notify(sim, FALSE);
+	else
+		ofono_error("%s: bad SIM state (%u)",
+				__func__, status->card_state);
+
+	/* TODO(CDMA): need some kind of logic to set the correct app_index */
+	search_index = status->gsm_umts_index;
+
+	/*
+	 * We cache the current password state. Ideally this should be done by
+	 * issuing a GET_SIM_STATUS request from ril_query_passwd_state, which
+	 * is called by the core after sending a password, but unfortunately the
+	 * response to GET_SIM_STATUS is not reliable in mako when sent just
+	 * after sending the password. Some time is needed before the modem
+	 * refreshes its internal state, and when it does it sends a
+	 * SIM_STATUS_CHANGED event. In that moment we retrieve the status and
+	 * this function is executed. We call __ofono_sim_recheck_pin as it is
+	 * the only way to indicate the core to call query_passwd_state again.
+	 * An option that can be explored in the future is wait before invoking
+	 * core callback for send_passwd until we know the real password state.
+	 */
+	if (status->card_state == RIL_CARDSTATE_PRESENT
+			&& search_index < status->num_apps) {
+		struct reply_sim_app *app = status->apps[search_index];
+
+		if (app->app_type != RIL_APPTYPE_UNKNOWN) {
+			configure_active_app(sd, app, search_index);
+			DBG("passwd_state: %d", sd->passwd_state);
+
+			/*
+			 * Note: There doesn't seem to be any other way to force
+			 * the core SIM code to recheck the PIN. This call
+			 * causes the core to call the this atom's
+			 * query_passwd() function.
+			 */
+			__ofono_sim_recheck_pin(sim);
+		}
 	}
 
 	g_ril_reply_free_sim_status(status);
@@ -823,7 +823,7 @@
 		g_free(retries);
 	}
 
-	/* TODO: re-bfactor to not use macro for FAILURE;
+	/* TODO: re-factor to not use macro for FAILURE;
 	   doesn't return error! */
 	if (message->error == RIL_E_SUCCESS) {
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
@@ -992,19 +992,40 @@
 	}
 }
 
-static gboolean ril_sim_register(gpointer user)
+static gboolean listen_and_get_sim_status(gpointer user)
 {
 	struct ofono_sim *sim = user;
 	struct sim_data *sd = ofono_sim_get_data(sim);
 
- 	DBG("");
-
- 	send_get_sim_status(sim);
+	send_get_sim_status(sim);
 
 	g_ril_register(sd->ril, RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED,
 			(GRilNotifyFunc) ril_sim_status_changed, sim);
 
 	/* TODO: should we also register for RIL_UNSOL_SIM_REFRESH? */
+	return FALSE;
+}
+
+static gboolean ril_sim_register(gpointer user)
+{
+	struct ofono_sim *sim = user;
+	struct sim_data *sd = ofono_sim_get_data(sim);
+
+ 	DBG("");
+
+ 	ofono_sim_register(sim);
+
+	if (sd->ril_state_watch != NULL &&
+			!ofono_sim_add_state_watch(sim, sd->ril_state_watch,
+							sd->modem, NULL))
+		ofono_error("Error registering ril sim watch");
+
+	/*
+	 * We use g_idle_add here to make sure that the presence of the SIM
+	 * interface is signalled before signalling anything else from the said
+	 * interface, as ofono_sim_register also uses g_idle_add.
+	 */
+	g_idle_add(listen_and_get_sim_status, sim);
 
 	return FALSE;
 }
@@ -1025,7 +1046,6 @@
 	sd->app_type = RIL_APPTYPE_UNKNOWN;
 	sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
 	sd->passwd_type = OFONO_SIM_PASSWORD_NONE;
-	sd->sim_registered = FALSE;
 	sd->modem = ril_data->modem;
 	sd->ril_state_watch = ril_data->ril_state_watch;
 

=== modified file 'plugins/mtk.c'
--- plugins/mtk.c	2015-01-13 14:13:08 +0000
+++ plugins/mtk.c	2015-02-06 15:08:43 +0000
@@ -66,6 +66,8 @@
 #include "drivers/mtkmodem/mtk_constants.h"
 #include "drivers/mtkmodem/mtkutil.h"
 #include "drivers/mtkmodem/mtkrequest.h"
+#include "drivers/mtkmodem/mtkreply.h"
+#include "drivers/mtkmodem/mtksettings.h"
 
 #define MAX_SIM_STATUS_RETRIES 15
 
@@ -76,18 +78,25 @@
 #define SIM_2_ACTIVE 2
 #define NO_SIM_ACTIVE 0
 
+#define SOCKET_NUM_FOR_DBG_0 -1
+#define SOCKET_NUM_FOR_DBG_1 -2
+
 /* this gives 30s for rild to initialize */
 #define RILD_MAX_CONNECT_RETRIES 5
 #define RILD_CONNECT_RETRY_TIME_S 5
 
 #define T_WAIT_DISCONN_MS 1000
 
+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;
 	int sim_status_retries;
 	ofono_bool_t ofono_online;
+	ofono_bool_t ofono_online_target;
 	int radio_state;
 	struct ofono_sim *sim;
 	/* pending_* are used in case we are disconnected from the socket */
@@ -110,6 +119,9 @@
 	struct ofono_call_barring *call_barring;
 	struct ofono_gprs *gprs;
 	struct ofono_message_waiting *message_waiting;
+	struct ofono_modem *ofono_modem;
+	ofono_bool_t has_3g;
+	struct mtk_settings_data *mtk_settings;
 };
 
 /*
@@ -125,11 +137,23 @@
 static gboolean disconnect_expected;
 static guint not_disconn_cb_id;
 
-static void send_get_sim_status(struct ofono_modem *modem);
+struct socket_data {
+	GRil *gril;
+	const char *path;
+	int radio_state;
+	guint radio_state_ev_id;
+};
+
+static struct socket_data *sock_0, *sock_1;
+
 static int create_gril(struct ofono_modem *modem);
 static gboolean mtk_connected(gpointer user_data);
 static void mtk_set_online(struct ofono_modem *modem, ofono_bool_t online,
 				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,
+			const char *hex_prefix);
 
 static void mtk_debug(const char *str, void *user_data)
 {
@@ -146,6 +170,14 @@
 		return mtk_0;
 }
 
+static struct socket_data *socket_complement(struct socket_data *sock)
+{
+	if (sock == sock_0)
+		return sock_1;
+	else
+		return sock_0;
+}
+
 /*
  * mtk_set_attach_state and mtk_detach_received are called by mtkmodem's gprs
  * driver. They are needed to solve an issue with data attachment: in case
@@ -197,13 +229,34 @@
 	}
 }
 
-static gboolean sim_status_retry(gpointer user_data)
+static void radio_state_changed(struct ril_msg *message, gpointer user_data)
 {
-	struct ofono_modem *modem = user_data;
-	send_get_sim_status(modem);
-
-	/* Makes this a single shot */
-	return FALSE;
+	struct socket_data *sock = user_data;
+	int radio_state = g_ril_unsol_parse_radio_state_changed(sock->gril,
+								message);
+
+	if (radio_state != sock->radio_state) {
+		struct socket_data *sock_c = socket_complement(sock);
+
+		ofono_info("%s, state: %s", __func__,
+				ril_radio_state_to_string(radio_state));
+
+		/*
+		 * If there is just one slot, just start it. Otherwise, we ask
+		 * 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);
+		} else if (sock->radio_state == RADIO_STATE_UNAVAILABLE &&
+				sock_c != NULL && sock_c->radio_state !=
+						RADIO_STATE_UNAVAILABLE) {
+			query_3g_caps(sock);
+		}
+
+		sock->radio_state = radio_state;
+	}
 }
 
 static void mtk_radio_state_changed(struct ril_msg *message, gpointer user_data)
@@ -220,9 +273,6 @@
 				ril_radio_state_to_string(radio_state),
 				ril->ofono_online);
 
-		if (ril->radio_state == RADIO_STATE_UNAVAILABLE)
-			mtk_connected(modem);
-
 		ril->radio_state = radio_state;
 
 		switch (radio_state) {
@@ -275,65 +325,6 @@
 	}
 }
 
-static void sim_status_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct mtk_data *ril = ofono_modem_get_data(modem);
-	struct reply_sim_status *status;
-
-	DBG("slot %d", ril->slot);
-
-	if (message->error != RIL_E_SUCCESS) {
-		ril->sim_status_retries++;
-
-		ofono_error("[slot %d] GET_SIM_STATUS request failed: "
-				"%s; retries: %d",
-				ril->slot, ril_error_to_string(message->error),
-				ril->sim_status_retries);
-
-		if (ril->sim_status_retries < MAX_SIM_STATUS_RETRIES)
-			g_timeout_add_seconds(2, sim_status_retry, modem);
-		else
-			ofono_error("[slot %d] Max retries for GET_SIM_STATUS"
-					" exceeded!", ril->slot);
-	} else {
-
-		/* Register for changes in SIM insertion */
-		g_ril_register(ril->modem, MTK_RIL_UNSOL_SIM_PLUG_OUT,
-				sim_removed, modem);
-		g_ril_register(ril->modem, MTK_RIL_UNSOL_SIM_PLUG_IN,
-				sim_inserted, modem);
-
-		if ((status = g_ril_reply_parse_sim_status(ril->modem, message))
-				!= NULL) {
-
-			if (status->card_state == RIL_CARDSTATE_PRESENT) {
-				DBG("Card PRESENT; num_apps: %d",
-					status->num_apps);
-
-				ofono_sim_inserted_notify(ril->sim, TRUE);
-			} else {
-				ofono_warn("[slot %d] Card NOT_PRESENT",
-						ril->slot);
-
-				ofono_sim_inserted_notify(ril->sim, FALSE);
-			}
-			g_ril_reply_free_sim_status(status);
-		}
-	}
-}
-
-static void send_get_sim_status(struct ofono_modem *modem)
-{
-	struct mtk_data *ril = ofono_modem_get_data(modem);
-
-	DBG("slot %d", ril->slot);
-
-	if (g_ril_send(ril->modem, RIL_REQUEST_GET_SIM_STATUS, NULL,
-			sim_status_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);
@@ -355,6 +346,8 @@
 
 	DBG("slot %d", ril->slot);
 
+	ril->ofono_modem = modem;
+
 	ofono_modem_set_data(modem, ril);
 
 	return 0;
@@ -521,9 +514,11 @@
 	ofono_radio_settings_create(modem, OFONO_RIL_VENDOR_MTK,
 					MTKMODEM, ril->modem);
 
-	/* Ask sim status */
-	ril->sim_status_retries = 0;
-	send_get_sim_status(modem);
+	/* Register for changes in SIM insertion */
+	g_ril_register(ril->modem, MTK_RIL_UNSOL_SIM_PLUG_OUT,
+			sim_removed, modem);
+	g_ril_register(ril->modem, MTK_RIL_UNSOL_SIM_PLUG_IN,
+			sim_inserted, modem);
 }
 
 static void mtk_sim_mode_cb(struct ril_msg *message, gpointer user_data)
@@ -546,11 +541,18 @@
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
 	}
 
+	if (ril->ofono_online)
+		ril->mtk_settings =
+			mtk_settings_create(ril->ofono_modem, ril->modem,
+						ril->has_3g);
+	else
+		mtk_settings_remove(ril->mtk_settings);
+
 	/* Execute possible pending operation on the other modem */
 
 	ril_c = ril_complement(ril);
 
-	if (ril_c->pending_online_cbd) {
+	if (ril_c != NULL && ril_c->pending_online_cbd) {
 		struct cb_data *pending_cbd = ril_c->pending_online_cbd;
 		ofono_modem_online_cb_t pending_cb = pending_cbd->cb;
 
@@ -671,6 +673,8 @@
 	if (message->error == RIL_E_SUCCESS) {
 		g_ril_print_response_no_args(ril->modem, message);
 
+		mtk_settings_remove(ril->mtk_settings);
+
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
 	} else {
 		ofono_error("%s: RIL error %s", __func__,
@@ -751,6 +755,39 @@
 	}
 }
 
+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);
+}
+
+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);
+	else
+		mtk_set_online(mtk_1->ofono_modem, TRUE, set_online_cb, NULL);
+}
+
+void mtk_reset_all_modems(void)
+{
+	if (!mtk_0->ofono_online && !mtk_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);
+	else
+		mtk_set_online(mtk_1->ofono_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);
@@ -770,14 +807,97 @@
 {
 	struct mtk_data *ril = ofono_modem_get_data(modem);
 
-	ofono_call_volume_remove(ril->callvolume);
+	if (__ofono_modem_find_atom(modem, OFONO_ATOM_TYPES_CALL_VOLUME))
+		ofono_call_volume_remove(ril->callvolume);
 	ril->callvolume = NULL;
-	ofono_voicecall_remove(ril->voicecall);
+	if (__ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_VOICECALL))
+		ofono_voicecall_remove(ril->voicecall);
 	ril->voicecall = NULL;
-	ofono_devinfo_remove(ril->devinfo);
+	if (__ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_DEVINFO))
+		ofono_devinfo_remove(ril->devinfo);
 	ril->devinfo = NULL;
 }
 
+static void start_slot(struct mtk_data *ril, 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);
+
+	if (getenv("OFONO_RIL_TRACE"))
+		g_ril_set_trace(ril->modem, 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);
+}
+
+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;
+	int slot_3g;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: error %s", __func__,
+				ril_error_to_string(message->error));
+		return;
+	}
+
+	slot_3g = g_mtk_reply_parse_get_3g_capability(sock->gril, message);
+
+	/*
+	 * The socket at sock_slot_0 always connects to the slot with 3G
+	 * capabilities, while sock_slot_1 connects to the slot that is just 2G.
+	 * However, the physical slot that owns the 3G capabilities can be
+	 * changed dynamically using a RILd request, so the sockets can connect
+	 * 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.
+	 */
+	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;
+	} else {
+		sock_for_mtk_0 = sock_1;
+		sock_for_mtk_1 = sock_0;
+		mtk_0->has_3g = FALSE;
+		mtk_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);
+
+	g_free(sock_0);
+	sock_0 = NULL;
+	g_free(sock_1);
+	sock_1 = NULL;
+}
+
+static void query_3g_caps(struct socket_data *sock)
+{
+	if (g_ril_send(sock->gril, MTK_RIL_REQUEST_GET_3G_CAPABILITY, NULL,
+			query_3g_caps_cb, sock, NULL) <= 0)
+		ofono_error("%s Error querying 3G capabilities", __func__);
+}
+
 static gboolean mtk_connected(gpointer user_data)
 {
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
@@ -787,10 +907,14 @@
 
 	DBG("calling set_powered(TRUE)");
 
-	ofono_modem_set_powered(modem, TRUE);
+	if (!ofono_modem_get_powered(modem))
+		ofono_modem_set_powered(modem, TRUE);
 
 	create_atoms_on_connection(modem);
 
+	if (ril->pending_cb)
+		ril->pending_cb(ril->pending_cbd);
+
 	/* Call the function just once */
 	return FALSE;
 }
@@ -805,11 +929,6 @@
 	if (create_gril(modem) < 0)
 		return TRUE;
 
-	create_atoms_on_connection(modem);
-
-	if (ril->pending_cb)
-		ril->pending_cb(ril->pending_cbd);
-
 	/* Reconnected: do not call this again */
 	return FALSE;
 }
@@ -841,30 +960,34 @@
 
 static const char sock_slot_0[] = "/dev/socket/rild";
 static const char sock_slot_1[] = "/dev/socket/rild2";
-static const char hex_slot_0[] = "Slot 0: ";
-static const char hex_slot_1[] = "Slot 1: ";
 
 static int create_gril(struct ofono_modem *modem)
 {
 	struct mtk_data *ril = ofono_modem_get_data(modem);
-	const char *sock_path;
-	const char *hex_prefix;
+	struct socket_data *sock;
+	int sock_num;
 
 	DBG("slot %d", ril->slot);
 
 	if (ril->modem != NULL)
 		return 0;
 
+	sock = g_try_malloc0(sizeof(*sock));
+	if (sock == NULL) {
+		ofono_error("%s: Cannot allocate socket_data", __func__);
+		return -ENOMEM;
+	}
+
 	if (ril->slot == MULTISIM_SLOT_0) {
-		sock_path = sock_slot_0;
-		hex_prefix = hex_slot_0;
+		sock_num = SOCKET_NUM_FOR_DBG_0;
+		sock->path = sock_slot_0;
 	} else {
-		sock_path = sock_slot_1;
-		hex_prefix = hex_slot_1;
+		sock_num = SOCKET_NUM_FOR_DBG_1;
+		sock->path = sock_slot_1;
 	}
 
 	/* Opens the socket to RIL */
-	ril->modem = g_ril_new(sock_path, OFONO_RIL_VENDOR_MTK);
+	sock->gril = g_ril_new(sock->path, OFONO_RIL_VENDOR_MTK);
 
 	/*
 	 * NOTE: Since AT modems open a tty, and then call
@@ -875,28 +998,34 @@
 	 * abstraction... ( probaby not a bad idea ).
 	 */
 
-	if (ril->modem == NULL) {
-		ofono_error("g_ril_new() failed to create modem %d!",
-				ril->slot);
+	if (sock->gril == 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) {
+		sock_0 = sock;
+	} else {
+		sock_1 = sock;
 	}
 
-	g_ril_set_slot(ril->modem, ril->slot);
-
-	g_ril_set_vendor_print_msg_id_funcs(ril->modem,
+	sock->radio_state = RADIO_STATE_UNAVAILABLE;
+	sock->radio_state_ev_id =
+		g_ril_register(sock->gril,
+				RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED,
+				radio_state_changed, sock);
+
+	/* sock_num is negative to avoid confusion with physical slots */
+	g_ril_set_slot(sock->gril, sock_num);
+
+	g_ril_set_vendor_print_msg_id_funcs(sock->gril,
 						mtk_request_id_to_string,
 						mtk_unsol_request_to_string);
 
 	if (getenv("OFONO_RIL_TRACE"))
-		g_ril_set_trace(ril->modem, TRUE);
+		g_ril_set_trace(sock->gril, 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, modem);
-
-	g_ril_register(ril->modem, RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED,
-			mtk_radio_state_changed, modem);
+		g_ril_set_debugf(sock->gril, mtk_debug, (char *) sock->path);
 
 	return 0;
 }
@@ -923,14 +1052,14 @@
 {
 	int ret;
 
+	/* We handle SIM states due to MTK peculiarities */
+	ofono_modem_set_driver_watches_sim(modem, TRUE);
+
 	ret = create_gril(modem);
 	if (ret < 0)
 		g_timeout_add_seconds(RILD_CONNECT_RETRY_TIME_S,
 					connect_rild, modem);
 
-	/* We handle SIM states due to MTK peculiarities */
-	ofono_modem_set_driver_watches_sim(modem, TRUE);
-
 	/*
 	 * We will mark the modem as powered when we receive an event that
 	 * confirms that the radio is in a state different from unavailable

=== modified file 'plugins/ril.c'
--- plugins/ril.c	2015-01-13 14:13:08 +0000
+++ plugins/ril.c	2015-02-06 15:08:43 +0000
@@ -84,8 +84,6 @@
 	int rild_connect_retries;
 };
 
-static void send_get_sim_status(struct ofono_modem *modem);
-
 static void ril_debug(const char *str, void *user_data)
 {
 	const char *prefix = user_data;
@@ -93,15 +91,6 @@
 	ofono_info("%s%s", prefix, str);
 }
 
-static gboolean sim_status_retry(gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	send_get_sim_status(modem);
-
-	/* Makes this a single shot */
-	return FALSE;
-}
-
 static void ril_radio_state_changed(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -127,7 +116,6 @@
 						ril->vendor, RILMODEM,
 						ril->modem);
 
-			send_get_sim_status(modem);
 			break;
 
 		case RADIO_STATE_UNAVAILABLE:
@@ -150,56 +138,6 @@
 	}
 }
 
-static void sim_status_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct ril_data *ril = ofono_modem_get_data(modem);
-	struct reply_sim_status *status;
-
-	DBG("");
-
-	if (message->error != RIL_E_SUCCESS) {
-		ril->sim_status_retries++;
-
-		ofono_error("GET_SIM_STATUS request failed: %s; retries: %d",
-				ril_error_to_string(message->error),
-				ril->sim_status_retries);
-
-		if (ril->sim_status_retries < MAX_SIM_STATUS_RETRIES)
-			g_timeout_add_seconds(2, sim_status_retry, modem);
-		else
-			ofono_error("Max retries for GET_SIM_STATUS exceeded!");
-	} else {
-
-		if ((status = g_ril_reply_parse_sim_status(ril->modem, message))
-				!= NULL) {
-
-			if (status->card_state == RIL_CARDSTATE_PRESENT) {
-				DBG("Card PRESENT; num_apps: %d",
-					status->num_apps);
-
-				ofono_sim_inserted_notify(ril->sim, TRUE);
-
-			} else {
-				ofono_warn("Card NOT_PRESENT.");
-
-				ofono_sim_inserted_notify(ril->sim, FALSE);
-			}
-			g_ril_reply_free_sim_status(status);
-		}
-	}
-}
-
-static void send_get_sim_status(struct ofono_modem *modem)
-{
-	struct ril_data *ril = ofono_modem_get_data(modem);
-
-	DBG("");
-
-	g_ril_send(ril->modem, RIL_REQUEST_GET_SIM_STATUS, NULL,
-			sim_status_cb, modem, NULL);
-}
-
 int ril_create(struct ofono_modem *modem, enum ofono_ril_vendor vendor)
 {
 	struct ril_data *ril = g_try_new0(struct ril_data, 1);

=== added file 'test/set-3g-slot'
--- test/set-3g-slot	1970-01-01 00:00:00 +0000
+++ test/set-3g-slot	2015-02-06 15:08:43 +0000
@@ -0,0 +1,20 @@
+#!/usr/bin/python3
+
+import dbus
+import sys
+
+bus = dbus.SystemBus()
+
+if len(sys.argv) == 2:
+	path = sys.argv[1]
+else:
+	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+			'org.ofono.Manager')
+	modems = manager.GetModems()
+	path = modems[0][0]
+
+print("Activate 3G for %s..." % path)
+mtks = dbus.Interface(bus.get_object('org.ofono', path),
+		'org.ofono.MtkSettings')
+
+mtks.SetProperty("Has3G", True)

=== modified file 'unit/test-mtkreply.c'
--- unit/test-mtkreply.c	2014-07-29 16:35:05 +0000
+++ unit/test-mtkreply.c	2015-02-06 15:08:43 +0000
@@ -53,7 +53,7 @@
 };
 
 struct rep_3g_capability_test {
-	int is_3g;
+	int slot_3g;
 	const struct ril_msg msg;
 };
 
@@ -113,7 +113,7 @@
 };
 
 static const struct rep_3g_capability_test mtk_reply_3g_capability_valid_1 = {
-	.is_3g = 1,
+	.slot_3g = 0,
 	.msg = {
 		.buf = (char *) &mtk_reply_3g_capability_valid_parcel1,
 		.buf_len = sizeof(mtk_reply_3g_capability_valid_parcel1),
@@ -153,9 +153,9 @@
 {
 	GRil *gril = g_ril_new(NULL, OFONO_RIL_VENDOR_MTK);
 	const struct rep_3g_capability_test *test = data;
-	int is_3g = g_mtk_reply_parse_get_3g_capability(gril, &test->msg);
+	int slot_3g = g_mtk_reply_parse_get_3g_capability(gril, &test->msg);
 
-	g_assert(is_3g == test->is_3g);
+	g_assert(slot_3g == test->slot_3g);
 
 	g_ril_unref(gril);
 }

=== modified file 'unit/test-mtkrequest.c'
--- unit/test-mtkrequest.c	2014-06-12 11:02:03 +0000
+++ unit/test-mtkrequest.c	2015-02-06 15:08:43 +0000
@@ -207,6 +207,18 @@
 	.parcel_size = sizeof(req_set_fd_mode_parcel_valid_2),
 };
 
+/* MTK: set_3g_capability tests */
+
+static const guchar req_set_3g_capability_valid_1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+};
+
+static const struct request_test_data set_set_3g_capability_valid_test_1 = {
+	.request = NULL,
+	.parcel_data = req_set_3g_capability_valid_1,
+	.parcel_size = sizeof(req_set_3g_capability_valid_1),
+};
+
 /* Test functions */
 
 static void test_mtk_req_sim_read_binary_valid(gconstpointer data)
@@ -322,6 +334,19 @@
 	parcel_free(&rilp);
 }
 
+static void test_request_set_3g_capability(gconstpointer data)
+{
+	const struct request_test_data *test_data = data;
+	struct parcel rilp;
+
+	g_mtk_request_set_3g_capability(NULL, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,
+				test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
 #endif	/* LITTLE_ENDIAN */
 
 int main(int argc, char **argv)
@@ -376,6 +401,11 @@
 				&set_fd_mode_valid_test_2,
 				test_request_set_fd_mode);
 
+	g_test_add_data_func("/testmtkrequest/mtk-settings: "
+				"valid SET_3G_CAPABILITY Test 1",
+				&set_set_3g_capability_valid_test_1,
+				test_request_set_3g_capability);
+
 #endif	/* LITTLE_ENDIAN */
 
 	return g_test_run();