Merge lp:~phablet-team/ofono/mbpi-nettime-plus-oem-fixes into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

  * drivers/rilmodem/sim.c: notify on SIM removal (LP: #1332306)
  * unit/rilmodem/test-sim-online: fix serial number check (LP: #1334867)
  * plugins/mtk.c: fix race condition when onlining modem
  * build, drivers/infeonmodem, drivers/rilmodem, gril,
    plugins/infeon.c, plugins/ril.*, unit: add Infeon OEM hooks
  * build, plugins/ubuntu-provision.c, ubuntu-apndb.*: re-named
    provisioning plugin code from android-* to ubuntu-*. Also removed
    code that queries mobile-broadband-provider-info's db, and finally
    implemented a /custom hook for custom apn dbs (LP: #1315509).

This branch includes the following changes and bug fixes:

1. It removes querying of the mobile-broadband-provider-info apn db during GPRS/MMS provisioning.

2. It adds a custom hook to GPRS/MSS provisioning ( see bug #1315509 ).

3. It allows the custom and system apn dbs to be overriden by environment variables ( OFONO_CUSTOM_APNDB_PATH & OFONO_SYSTEM_APNDB_PATH) for test purposes.

4. It adds new OEM hooks which allow enablement of Infeon-based modems.

5. It fixes a race condition with dual-SIM MTK-based modems.

6. The rilmodem driver code now notifies the ofono core when SIM card removal is detected ( see bug #1332306 ).

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

[lp:~phablet-team/ofono/mbpi-nettime-plus-oem-fixes]

6871. By Tony Espy on 2014-07-18

plugins: added debug hooks to ubuntu-provision

6872. By Tony Espy on 2014-07-21

plugins: fix ubuntu-provision's error logic

=== modified file 'Makefile.am'
--- Makefile.am	2014-06-24 18:59:26 +0000
+++ Makefile.am	2014-07-21 18:55:43 +0000
@@ -127,6 +127,9 @@
 builtin_modules += mtk
 builtin_sources += plugins/mtk.c
 
+builtin_modules += infineon
+builtin_sources += plugins/infineon.c
+
 builtin_modules += androidspntable
 builtin_sources += plugins/android-spn-table.c
 
@@ -506,13 +509,13 @@
 
 if PROVISION
 builtin_sources += plugins/mbpi.h plugins/mbpi.c
-builtin_sources += plugins/android-apndb.h plugins/android-apndb.c
+builtin_sources += plugins/ubuntu-apndb.h plugins/ubuntu-apndb.c
 
 builtin_modules += provision
 builtin_sources += plugins/provision.c
 
-builtin_modules += android_provision
-builtin_sources += plugins/android-provision.c
+builtin_modules += ubuntu_provision
+builtin_sources += plugins/ubuntu-provision.c
 
 builtin_modules += cdma_provision
 builtin_sources += plugins/cdma-provision.c
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-06-25 00:58:02 +0000
+++ debian/changelog	2014-07-21 18:55:43 +0000
@@ -1,3 +1,22 @@
+ofono (1.12.bzr6870+14.10.20140625-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Martti Piirainen ]
+  * drivers/rilmodem/sim.c: notify on SIM removal (LP: #1332306)
+  * unit/rilmodem/test-sim-online: fix serial number check (LP: #1334867)
+
+  [ Alfonso Sanchez-Beato ]
+  * plugins/mtk.c: fix race condition when onlining modem
+  * build, drivers/infeonmodem, drivers/rilmodem, gril,
+    plugins/infeon.c, plugins/ril.*, unit: add Infeon OEM hooks
+
+  [ Tony Espy ]
+  * build, plugins/ubuntu-provision.c, ubuntu-apndb.*: re-named
+    provisioning plugin code from android-* to ubuntu-*.  Also removed
+    code that queries mobile-broadband-provider-info's db, and finally
+    implemented a /custom hook for custom apn dbs (LP: #1315509).
+
+ -- Tony Espy <[e-mail]>  Wed, 16 Jul 2014 15:06:02 -0400
+
 ofono (1.12.bzr6868+14.10.20140625-0ubuntu1) utopic; urgency=medium
 
   [ Alfonso Sanchez-Beato ]
 
=== added directory 'drivers/infineonmodem'
=== added file 'drivers/infineonmodem/infineon_constants.h'
--- drivers/infineonmodem/infineon_constants.h	1970-01-01 00:00:00 +0000
+++ drivers/infineonmodem/infineon_constants.h	2014-07-21 18:55:43 +0000
@@ -0,0 +1,77 @@
+/*
+ *
+ *  RIL constants for infineon modem
+ *
+ *  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 INFINEON_CONSTANTS_H
+#define INFINEON_CONSTANTS_H
+
+/* Messages encapsulated in RIL_REQUEST_OEM_HOOK_RAW requests */
+#define INF_RIL_REQUEST_OEM_QUERY_SELECT_BAND 1
+#define INF_RIL_REQUEST_OEM_SET_SELECT_BAND 2
+#define INF_RIL_REQUEST_OEM_SET_CIRCUIT_SWITCHING_PAGING 3
+#define INF_RIL_REQUEST_OEM_GET_LAST_FAILURE_REPORT_FOR_CS_REGISTRATION 4
+#define INF_RIL_REQUEST_OEM_GET_SELECT_BEARER_SERVICE_TYPE 5
+#define INF_RIL_REQUEST_OEM_GET_XPROGRESS_STATUS 6
+#define INF_RIL_REQUEST_OEM_SET_SS_NOTIFY 7
+#define INF_RIL_REQUEST_OEM_GET_SS_NOTIFY 8
+#define INF_RIL_REQUEST_OEM_SET_AUTHENTICATION_TYPE 9
+#define INF_RIL_REQUEST_OEM_SWITCH_OFF_MS 10
+#define INF_RIL_REQUEST_OEM_SET_AUTO_TIMEZONE_UPDATE 11
+#define INF_RIL_REQUEST_OEM_SET_TIMEZONE_RESPORTING 12
+#define INF_RIL_REQUEST_OEM_SET_DISPLAY_SIM_AND_PB_STATUS 13
+#define INF_RIL_REQUEST_OEM_GET_REMAIN_SIM_PIN_ATTEMPTS 14
+#define INF_RIL_REQUEST_OEM_SET_AUTO_REDIAL 15
+#define INF_RIL_REQUEST_OEM_QUERY_CALL_STATUS_REPORTING 16
+#define INF_RIL_REQUEST_OEM_SET_AUTO_ANSWER 17
+#define INF_RIL_REQUEST_OEM_SET_LINE 18
+#define INF_RIL_REQUEST_OEM_PDP_ACTIVATE_OR_DEACTIVATE 19
+#define INF_RIL_REQUEST_OEM_QUERY_GPRS_MS_CLASS 20
+#define INF_RIL_REQUEST_OEM_SET_TRACE_AND_AT_INTERFACES 21
+#define INF_RIL_REQUEST_OEM_QUERY_TRACE_AND_AT_INTERFACES_CONFIGURE 22
+#define INF_RIL_REQUEST_OEM_SWITCH_TRACE_ON_OR_OFF 23
+#define INF_RIL_REQUEST_OEM_READ_EXCEPTION_LOG 24
+#define INF_RIL_REQUEST_OEM_GET_PHONE_ACTIVITY_STATUS 25
+#define INF_RIL_REQUEST_OEM_INITIATE_RESEND_SMS_IF_GPRS_FAILS 26
+#define INF_RIL_REQUEST_OEM_GET_DEVICE_NUMBER 27
+#define INF_RIL_REQUEST_OEM_ENABLE_STK 28
+#define INF_RIL_REQUEST_OEM_GET_SUBSCRIBER_NUMBER 29
+#define INF_RIL_REQUEST_OEM_SELECT_PHONE_BOOK  30
+#define INF_RIL_REQUEST_OEM_READ_PHONE_BOOK    31
+#define INF_RIL_REQUEST_OEM_INSERT_RECORD_TO_PHONE_BOOK 32
+#define INF_RIL_REQUEST_OEM_DELECT_RECORD_IN_PHONE_BOOK  33
+#define INF_RIL_REQUEST_OEM_GET_RECORD_FIELDS_MAX_LEN   34 
+#define INF_RIL_REQUEST_OEM_SET_SERIAL_PORT 35
+#define INF_RIL_REQUEST_OEM_SET_DATA_PREFERED 36
+#define INF_RIL_REQUEST_OEM_SET_MODEM_ROUTING 37
+#define INF_RIL_REQUEST_OEM_CLEAR_MISS_NUMBER 38
+#define INF_RIL_REQUEST_OEM_ATH 39
+#define INF_RIL_REQUEST_OEM_NOSIG_MODE_TEST  40
+#define INF_RIL_REQUEST_OEM_SELECT_3G_BAND   41
+#define INF_RIL_REQUEST_OEM_QUERY_3G_BAND    42
+#define INF_RIL_REQUEST_OEM_HW_RESET_MODEM   43
+#define INF_RIL_REQUEST_OEM_QUERY_DIRECT     44
+#define INF_RIL_REQUEST_OEM_USER_PLMN_QUERY  45
+#define INF_RIL_REQUEST_OEM_USER_PLMN_SET    46
+#define INF_RIL_REQUEST_OEM_USER_PLMN_DELTE  47
+#define INF_RIL_REQUEST_OEM_SET_USB_LOG      48
+#define INF_RIL_REQUEST_OEM_UPDATE_CSQ       49
+#define INF_RIL_REQUEST_OEM_DUMP_CELL_ENV    50
+
+#endif /* INFINEON_CONSTANTS_H */
 
=== modified file 'drivers/rilmodem/sim.c'
--- drivers/rilmodem/sim.c	2014-06-24 18:59:26 +0000
+++ drivers/rilmodem/sim.c	2014-07-21 18:55:43 +0000
@@ -51,6 +51,8 @@
 #include "grilrequest.h"
 #include "grilunsol.h"
 
+#include "drivers/infineonmodem/infineon_constants.h"
+
 /*
  * Based on ../drivers/atmodem/sim.c.
  *
@@ -72,6 +74,7 @@
  */
 struct sim_data {
 	GRil *ril;
+	enum ofono_ril_vendor vendor;
 	gchar *aid_str;
 	guint app_type;
 	gchar *app_str;
@@ -675,6 +678,9 @@
 			 */
 			__ofono_sim_recheck_pin(sim);
 		}
+	} else if (status && status->card_state == RIL_CARDSTATE_ABSENT) {
+		ofono_info("SIM card absent");
+		ofono_sim_inserted_notify(sim, FALSE);
 	}
 
 	g_ril_reply_free_sim_status(status);
@@ -703,12 +709,72 @@
 	send_get_sim_status(sim);
 }
 
+static void inf_pin_retries_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_pin_retries_cb_t cb = cbd->cb;
+	struct sim_data *sd = cbd->user;
+	struct reply_oem_hook *reply = NULL;
+	int32_t *ret_data;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("Reply failure: %s",
+				ril_error_to_string(message->error));
+		goto error;
+	}
+
+	reply = g_ril_reply_oem_hook_raw(sd->ril, message);
+	if (reply == NULL) {
+		ofono_error("%s: parse error", __func__);
+		goto error;
+	}
+
+	if (reply->length < 5 * (int) sizeof(int32_t)) {
+		ofono_error("%s: reply too small", __func__);
+		goto error;
+	}
+
+	/* First integer is INF_RIL_REQUEST_OEM_GET_REMAIN_SIM_PIN_ATTEMPTS */
+	ret_data = reply->data;
+	sd->retries[OFONO_SIM_PASSWORD_SIM_PIN] = *(++ret_data);
+	sd->retries[OFONO_SIM_PASSWORD_SIM_PIN2] = *(++ret_data);
+	sd->retries[OFONO_SIM_PASSWORD_SIM_PUK] = *(++ret_data);
+	sd->retries[OFONO_SIM_PASSWORD_SIM_PUK2] = *(++ret_data);
+
+	g_ril_reply_free_oem_hook(reply);
+	CALLBACK_WITH_SUCCESS(cb, sd->retries, cbd->data);
+
+	return;
+
+error:
+	g_ril_reply_free_oem_hook(reply);
+	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+}
+
 static void ril_query_pin_retries(struct ofono_sim *sim,
 					ofono_sim_pin_retries_cb_t cb,
 					void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
-	CALLBACK_WITH_SUCCESS(cb, sd->retries, data);
+
+	if (sd->vendor == OFONO_RIL_VENDOR_INFINEON) {
+		struct cb_data *cbd = cb_data_new(cb, data, sd);
+		struct parcel rilp;
+		int32_t oem_req =
+			INF_RIL_REQUEST_OEM_GET_REMAIN_SIM_PIN_ATTEMPTS;
+
+		g_ril_request_oem_hook_raw(sd->ril, &oem_req,
+						sizeof(oem_req), &rilp);
+
+		/* Send request to RIL */
+		if (g_ril_send(sd->ril, RIL_REQUEST_OEM_HOOK_RAW, &rilp,
+				inf_pin_retries_cb, cbd, g_free) == 0) {
+			g_free(cbd);
+			CALLBACK_WITH_FAILURE(cb, NULL, data);
+		}
+	} else {
+		CALLBACK_WITH_SUCCESS(cb, sd->retries, data);
+	}
 }
 
 static void ril_query_passwd_state(struct ofono_sim *sim,
@@ -893,6 +959,7 @@
 
 	sd = g_new0(struct sim_data, 1);
 	sd->ril = g_ril_clone(ril);
+	sd->vendor = vendor;
 	sd->aid_str = NULL;
 	sd->app_str = NULL;
 	sd->app_type = RIL_APPTYPE_UNKNOWN;
 
=== modified file 'drivers/rilmodem/vendor.h'
--- drivers/rilmodem/vendor.h	2014-03-20 07:46:16 +0000
+++ drivers/rilmodem/vendor.h	2014-07-21 18:55:43 +0000
@@ -24,7 +24,8 @@
 
 enum ofono_ril_vendor {
 	OFONO_RIL_VENDOR_AOSP = 0,
-	OFONO_RIL_VENDOR_MTK
+	OFONO_RIL_VENDOR_MTK,
+	OFONO_RIL_VENDOR_INFINEON
 };
 
 #endif /* RILMODEM_VENDOR_H */
 
=== modified file 'gril/grilreply.c'
--- gril/grilreply.c	2014-05-13 01:21:09 +0000
+++ gril/grilreply.c	2014-07-21 18:55:43 +0000
@@ -1204,6 +1204,11 @@
 					retries[OFONO_SIM_PASSWORD_SIM_PUK],
 					retries[OFONO_SIM_PASSWORD_SIM_PUK2]);
 		break;
+	case OFONO_RIL_VENDOR_INFINEON:
+		ofono_error("%s: infineon type should not arrive here",
+				__func__);
+		g_assert(FALSE);
+		break;
 	}
 
 	if (rilp.malformed) {
@@ -1220,3 +1225,50 @@
 
 	return NULL;
 }
+
+void g_ril_reply_free_oem_hook(struct reply_oem_hook *oem_hook)
+{
+	if (oem_hook) {
+		g_free(oem_hook->data);
+		g_free(oem_hook);
+	}
+}
+
+struct reply_oem_hook *g_ril_reply_oem_hook_raw(GRil *gril,
+						const struct ril_msg *message)
+{
+	struct reply_oem_hook *reply = NULL;
+	struct parcel rilp;
+
+	reply = g_try_malloc0(sizeof(*reply));
+	if (reply == NULL) {
+		ofono_error("%s: out of memory", __func__);
+		goto end;
+	}
+
+	g_ril_init_parcel(message, &rilp);
+
+	reply->data = parcel_r_raw(&rilp, &(reply->length));
+
+	if (rilp.malformed) {
+		ofono_error("%s: malformed parcel", __func__);
+		g_ril_reply_free_oem_hook(reply);
+		reply = NULL;
+		goto end;
+	}
+
+	g_ril_append_print_buf(gril, "{%d", reply->length);
+
+	if (reply->data != NULL) {
+		char *hex_dump;
+		hex_dump = encode_hex(reply->data, reply->length, '\0');
+		g_ril_append_print_buf(gril, "%s,%s", print_buf, hex_dump);
+		g_free(hex_dump);
+	}
+
+	g_ril_append_print_buf(gril, "%s}", print_buf);
+	g_ril_print_response(gril, message);
+
+end:
+	return reply;
+}
 
=== modified file 'gril/grilreply.h'
--- gril/grilreply.h	2014-04-29 15:50:22 +0000
+++ gril/grilreply.h	2014-07-21 18:55:43 +0000
@@ -89,6 +89,11 @@
 	int provisioned;
 };
 
+struct reply_oem_hook {
+	int length;
+	void *data;
+};
+
 void g_ril_reply_free_avail_ops(struct reply_avail_ops *reply);
 
 struct reply_avail_ops *g_ril_reply_parse_avail_ops(GRil *gril,
@@ -160,6 +165,11 @@
 int *g_ril_reply_parse_retries(GRil *gril, const struct ril_msg *message,
 				enum ofono_sim_password_type passwd_type);
 
+void g_ril_reply_free_oem_hook(struct reply_oem_hook *oem_hook);
+
+struct reply_oem_hook *g_ril_reply_oem_hook_raw(GRil *gril,
+						const struct ril_msg *message);
+
 #ifdef __cplusplus
 }
 #endif
 
=== modified file 'gril/grilrequest.c'
--- gril/grilrequest.c	2014-06-12 08:29:40 +0000
+++ gril/grilrequest.c	2014-07-21 18:55:43 +0000
@@ -1030,3 +1030,18 @@
 	g_ril_append_print_buf(gril, "(%s,%s,%s)",
 				facility, old_passwd, new_passwd);
 }
+
+void g_ril_request_oem_hook_raw(GRil *gril, const void *payload, size_t length,
+					struct parcel *rilp)
+{
+	char *hex_dump = NULL;
+
+	parcel_init(rilp);
+	parcel_w_raw(rilp, payload, length);
+
+	if (payload != NULL)
+		hex_dump = encode_hex(payload, length, '\0');
+
+	g_ril_append_print_buf(gril, "(%s)", hex_dump? hex_dump: "(null)");
+	g_free(hex_dump);
+}
 
=== modified file 'gril/grilrequest.h'
--- gril/grilrequest.h	2014-06-12 08:29:40 +0000
+++ gril/grilrequest.h	2014-07-21 18:55:43 +0000
@@ -265,6 +265,9 @@
 						const char *new_passwd,
 						struct parcel *rilp);
 
+void g_ril_request_oem_hook_raw(GRil *gril, const void *payload, size_t length,
+					struct parcel *rilp);
+
 #ifdef __cplusplus
 }
 #endif
 
=== modified file 'gril/parcel.c'
--- gril/parcel.c	2013-12-05 13:53:09 +0000
+++ gril/parcel.c	2014-07-21 18:55:43 +0000
@@ -201,6 +201,58 @@
 	return ret;
 }
 
+int parcel_w_raw(struct parcel *p, const void* data, size_t len)
+{
+	if (data == NULL) {
+		parcel_w_int32(p, -1);
+		return 0;
+	}
+
+	parcel_w_int32(p, len);
+
+	for (;;) {
+
+		if (p->offset + len < p->capacity) {
+			/* There's enough space */
+			memcpy(p->data + p->offset, data, len);
+			p->offset += len;
+			p->size += len;
+			break;
+		} else {
+			/* Grow data and retry */
+			parcel_grow(p, len);
+		}
+	}
+	return 0;
+}
+
+void *parcel_r_raw(struct parcel *p, int *len)
+{
+	char *ret;
+
+	*len = parcel_r_int32(p);
+
+	if (p->malformed || *len <= 0)
+		return NULL;
+
+	if (p->offset + *len > p->size) {
+		ofono_error("%s: parcel is too small", __func__);
+		p->malformed = 1;
+		return NULL;
+	}
+
+	ret = g_try_malloc0(*len);
+	if (ret == NULL) {
+		ofono_error("%s: out of memory (%d bytes)", __func__, *len);
+		return NULL;
+	}
+
+	memcpy(ret, p->data + p->offset, *len);
+	p->offset += *len;
+
+	return ret;
+}
+
 size_t parcel_data_avail(struct parcel *p)
 {
 	return (p->size - p->offset);
 
=== modified file 'gril/parcel.h'
--- gril/parcel.h	2013-12-05 13:53:09 +0000
+++ gril/parcel.h	2014-07-21 18:55:43 +0000
@@ -39,6 +39,8 @@
 int parcel_w_int32(struct parcel *p, int32_t val);
 int parcel_w_string(struct parcel *p, const char *str);
 char *parcel_r_string(struct parcel *p);
+int parcel_w_raw(struct parcel *p, const void *data, size_t len);
+void *parcel_r_raw(struct parcel *p,  int *len);
 size_t parcel_data_avail(struct parcel *p);
 
 #endif
 
=== removed file 'plugins/android-apndb.c'
--- plugins/android-apndb.c	2014-04-25 16:10:01 +0000
+++ plugins/android-apndb.c	1970-01-01 00:00:00 +0000
@@ -1,494 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *                2013 Simon Busch <[e-mail]>
- *  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 <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#define OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/modem.h>
-#include <ofono/gprs-provision.h>
-#include <ofono/log.h>
-
-#include "android-apndb.h"
-
-/* TODO: consider reading path from an environment variable */
-
-#ifndef ANDROID_APN_DATABASE
-#define ANDROID_APN_DATABASE    "/android/system/etc/apns-conf.xml"
-#endif
-
-struct apndb_data {
-	const char *match_mcc;
-	const char *match_mnc;
-	const char *match_imsi;
-	const char *match_spn;
-	const char *match_gid1;
-	GSList *apns;
-	gboolean allow_duplicates;
-	gboolean mvno_found;
-};
-
-void android_apndb_ap_free(gpointer data)
-{
-	struct apndb_provision_data *ap = data;
-
-	g_free(ap->gprs_data.name);
-	g_free(ap->gprs_data.apn);
-	g_free(ap->gprs_data.username);
-	g_free(ap->gprs_data.password);
-	g_free(ap->gprs_data.message_proxy);
-	g_free(ap->gprs_data.message_center);
-
-	g_free(ap);
-}
-
-static void android_apndb_g_set_error(GMarkupParseContext *context,
-					GError **error,
-					GQuark domain,
-					gint code,
-					const gchar *fmt, ...)
-{
-	va_list ap;
-	gint line_number, char_number;
-
-	g_markup_parse_context_get_position(context, &line_number,
-						&char_number);
-	va_start(ap, fmt);
-
-	*error = g_error_new_valist(domain, code, fmt, ap);
-
-	va_end(ap);
-
-	g_prefix_error(error, "%s:%d ", ANDROID_APN_DATABASE, line_number);
-}
-
-static gboolean imsi_match(const char *imsi, const char *match)
-{
-	gboolean result = FALSE;
-	size_t imsi_len = strlen(imsi);
-	size_t match_len = strlen(match);
-	unsigned int i;
-
-	DBG("imsi %s match %s", imsi, match);
-
-	if (imsi_len != match_len)
-		goto done;
-
-	for (i = 0; i < imsi_len; i++) {
-		if (*(imsi + i) == *(match + i))
-			continue;
-		else if (*(match + i) == 'x')
-			continue;
-		else
-			goto done;
-	}
-
-	result = TRUE;
-
-done:
-	return result;
-}
-
-static enum ofono_gprs_context_type determine_apn_type(const char *types)
-{
-	/*
-	 * The database contains entries with the following type field contents:
-	 * - default
-	 * - default,mms
-	 * - default,supl
-	 * - defualt,supl,dun
-	 * - default,supl,mms
-	 * - mms
-	 */
-
-	if (g_strcmp0(types, "mms") == 0)
-		return OFONO_GPRS_CONTEXT_TYPE_MMS;
-	else if (g_str_has_prefix(types, "default"))
-		return OFONO_GPRS_CONTEXT_TYPE_INTERNET;
-	else
-		return OFONO_GPRS_CONTEXT_TYPE_ANY;
-}
-
-static char *android_apndb_sanitize_ipv4_address(const char *address)
-{
-	char **numbers = NULL;
-	char *sanitized_numbers[4];
-	unsigned int count = 0;
-	char *result = NULL;
-	char *numeral;
-
-	/*
-	 * As src/gprs.c expects MMS proxies to always be
-	 * specified using IPV4 numbers-and-dot notation,
-	 * we need to strip any leading "0"s from the
-	 * individual numeric components, otherwise they
-	 * will be treated as octal numbers
-	 * ( see 'man inet_aton' for details ).
-	 */
-
-	if (g_ascii_isdigit(*address) == FALSE)
-		goto done;
-
-	numbers = g_strsplit(address, ".", 4);
-
-	for (; (numeral = *(numbers+count)); count++) {
-		if (count > 3)
-			goto done;
-
-		for (; *numeral; numeral++) {
-			if (g_ascii_isdigit(*numeral) == FALSE)
-				goto done;
-			else if (*numeral == '0')
-				continue;
-			else
-				break;
-		}
-
-		if (*numeral)
-			sanitized_numbers[count] = numeral;
-		else
-			sanitized_numbers[count] = "0";
-	}
-
-	if (count != 4)
-		goto done;
-
-	result = g_strdup_printf("%s.%s.%s.%s",
-					sanitized_numbers[0],
-					sanitized_numbers[1],
-					sanitized_numbers[2],
-					sanitized_numbers[3]);
-
-done:
-	if (numbers != NULL)
-		g_strfreev(numbers);
-
-	return result;
-}
-
-static void toplevel_apndb_start(GMarkupParseContext *context,
-					const gchar *element_name,
-					const gchar **attribute_names,
-					const gchar **attribute_values,
-					gpointer userdata, GError **error)
-{
-	struct apndb_data *apndb = userdata;
-	struct apndb_provision_data *ap = NULL;
-	int i;
-	const gchar *carrier = NULL;
-	const gchar *mcc = NULL;
-	const gchar *mnc = NULL;
-	const gchar *apn = NULL;
-	const gchar *username = NULL;
-	const gchar *password = NULL;
-	const gchar *types = NULL;
-	const gchar *protocol = NULL;
-	const gchar *mmsproxy = NULL;
-	const gchar *mmsport = NULL;
-	const gchar *mmscenter = NULL;
-	const gchar *mvnomatch = NULL;
-	const gchar *mvnotype = NULL;
-	enum ofono_gprs_proto proto = OFONO_GPRS_PROTO_IP;
-	enum ofono_gprs_context_type type;
-
-	if (g_strcmp0(element_name, "apn") != 0)
-		return;
-
-	for (i = 0; attribute_names[i]; i++) {
-		if (g_strcmp0(attribute_names[i], "carrier") == 0)
-			carrier = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "mcc") == 0)
-			mcc = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "mnc") == 0)
-			mnc = attribute_values[i];
-	}
-
-	if (mcc == NULL) {
-		android_apndb_g_set_error(context, error, G_MARKUP_ERROR,
-					G_MARKUP_ERROR_MISSING_ATTRIBUTE,
-					"Missing attribute: mcc");
-		return;
-	}
-
-	if (mnc == NULL) {
-		android_apndb_g_set_error(context, error, G_MARKUP_ERROR,
-					G_MARKUP_ERROR_MISSING_ATTRIBUTE,
-					"Missing attribute: mnc");
-		return;
-	}
-
-	if (g_strcmp0(mcc, apndb->match_mcc) != 0 ||
-		g_strcmp0(mnc, apndb->match_mnc) != 0)
-		return;
-
-	for (i = 0; attribute_names[i]; i++) {
-		if (g_strcmp0(attribute_names[i], "apn") == 0)
-			apn = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "user") == 0)
-			username = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "password") == 0)
-			password = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "type") == 0)
-			types = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "protocol") == 0)
-			protocol = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "mmsc") == 0)
-			mmscenter = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "mmsproxy") == 0)
-			mmsproxy = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "mmsport") == 0)
-			mmsport = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "mvno_match_data") == 0)
-			mvnomatch = attribute_values[i];
-		else if (g_strcmp0(attribute_names[i], "mvno_type") == 0)
-			mvnotype = attribute_values[i];
-	}
-
-	if (apn == NULL) {
-		android_apndb_g_set_error(context, error, G_MARKUP_ERROR,
-					G_MARKUP_ERROR_MISSING_ATTRIBUTE,
-						"APN attribute missing");
-		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;
-		} else if (g_strcmp0(protocol, "IPV6") == 0) {
-			proto = OFONO_GPRS_PROTO_IPV6;
-		} else if (g_strcmp0(protocol, "IPV4V6") == 0) {
-			proto = OFONO_GPRS_PROTO_IPV4V6;
-		} else {
-			ofono_error("%s: APN %s has invalid protocol=%s"
-					"attribute", __func__, carrier,
-					protocol);
-			return;
-		}
-	}
-
-	if (mvnotype != NULL && mvnomatch != NULL) {
-
-		if (g_strcmp0(mvnotype, "imsi") == 0) {
-			DBG("APN %s is mvno_type 'imsi'", carrier);
-
-			if (apndb->match_imsi == NULL ||
-					imsi_match(apndb->match_imsi,
-							mvnomatch) == FALSE) {
-				DBG("Skipping MVNO 'imsi' APN %s with"
-					" match_data: %s", carrier, mvnomatch);
-				return;
-			}
-		} else if (g_strcmp0(mvnotype, "spn") == 0) {
-			DBG("APN %s is mvno_type 'spn'", carrier);
-
-			if (g_strcmp0(mvnomatch, apndb->match_spn) != 0) {
-				DBG("Skipping mvno 'spn' APN %s with"
-					" match_data: %s", carrier, mvnomatch);
-				return;
-			}
-
-		} else if (g_strcmp0(mvnotype, "gid") == 0) {
-			int match_len = strlen(mvnomatch);
-
-			DBG("APN %s is mvno_type 'gid'", carrier);
-
-			/* Check initial part of GID1 against match data */
-			if (apndb->match_gid1 == NULL ||
-					g_ascii_strncasecmp(mvnomatch,
-							apndb->match_gid1,
-							match_len) != 0) {
-				DBG("Skipping mvno 'gid' APN %s with"
-					" match_data: %s", carrier, mvnomatch);
-				return;
-			}
-		}
-	}
-
-	type = determine_apn_type(types);
-
-	if (type == OFONO_GPRS_CONTEXT_TYPE_ANY ||
-		(type == OFONO_GPRS_CONTEXT_TYPE_MMS && mmsproxy == NULL)) {
-		DBG("Skipping %s context; types: %s", apn, types);
-		return;
-	}
-
-	ap = g_try_new0(struct apndb_provision_data, 1);
-	if (ap == NULL) {
-		ofono_error("%s: out-of-memory trying to provision APN - %s",
-				__func__, carrier);
-		return;
-	}
-
-	ap->gprs_data.type = type;
-
-	if (carrier != NULL)
-		ap->gprs_data.name = g_strdup(carrier);
-
-	if (apn != NULL)
-		ap->gprs_data.apn = g_strdup(apn);
-
-	if (username != NULL)
-		ap->gprs_data.username = g_strdup(username);
-
-	if (password != NULL)
-		ap->gprs_data.password = g_strdup(password);
-
-	if (mmscenter != NULL && strlen(mmscenter) > 0)
-		ap->gprs_data.message_center = g_strdup(mmscenter);
-
-	if (mmsproxy != NULL && strlen(mmsproxy) > 0) {
-		char *tmp = android_apndb_sanitize_ipv4_address(mmsproxy);
-		if (tmp != NULL)
-			mmsproxy = tmp;
-
-		if (mmsport != NULL)
-			ap->gprs_data.message_proxy =
-				g_strdup_printf("%s:%s", mmsproxy, mmsport);
-		else
-			ap->gprs_data.message_proxy = g_strdup(mmsproxy);
-
-		g_free(tmp);
-	}
-
-	ap->gprs_data.proto = proto;
-
-	if (mvnotype != NULL) {
-		ap->mvno = TRUE;
-		apndb->mvno_found = TRUE;
-	}
-
-	apndb->apns = g_slist_append(apndb->apns, ap);
-}
-
-static void toplevel_apndb_end(GMarkupParseContext *context,
-					const gchar *element_name,
-					gpointer userdata, GError **error)
-{
-}
-
-static const GMarkupParser toplevel_apndb_parser = {
-	toplevel_apndb_start,
-	toplevel_apndb_end,
-	NULL,
-	NULL,
-	NULL,
-};
-
-static gboolean android_apndb_parse(const GMarkupParser *parser,
-					gpointer userdata,
-					GError **error)
-{
-	struct stat st;
-	char *db;
-	int fd;
-	GMarkupParseContext *context;
-	gboolean ret;
-	const char *apndb_path;
-
-	if ((apndb_path = getenv("OFONO_APNDB_PATH")) == NULL)
-		apndb_path = ANDROID_APN_DATABASE;
-
-	fd = open(apndb_path, O_RDONLY);
-	if (fd < 0) {
-		g_set_error(error, G_FILE_ERROR,
-				g_file_error_from_errno(errno),
-				"open(%s) failed: %s", apndb_path,
-				g_strerror(errno));
-		return FALSE;
-	}
-
-	if (fstat(fd, &st) < 0) {
-		close(fd);
-		g_set_error(error, G_FILE_ERROR,
-				g_file_error_from_errno(errno),
-				"fstat(%s) failed: %s", apndb_path,
-				g_strerror(errno));
-		return FALSE;
-	}
-
-	db = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-	if (db == MAP_FAILED) {
-		close(fd);
-		g_set_error(error, G_FILE_ERROR,
-				g_file_error_from_errno(errno),
-				"mmap(%s) failed: %s", apndb_path,
-				g_strerror(errno));
-		return FALSE;
-	}
-
-	context = g_markup_parse_context_new(parser,
-						G_MARKUP_TREAT_CDATA_AS_TEXT,
-						userdata, NULL);
-
-	ret = g_markup_parse_context_parse(context, db, st.st_size, error);
-
-	if (ret == TRUE)
-		g_markup_parse_context_end_parse(context, error);
-
-	munmap(db, st.st_size);
-	close(fd);
-	g_markup_parse_context_free(context);
-
-	return ret;
-}
-
-GSList *android_apndb_lookup_apn(const char *mcc, const char *mnc,
-			const char *spn, const char *imsi, const char *gid1,
-			gboolean *mvno_found, GError **error)
-{
-	struct apndb_data apndb = { NULL };
-
-	apndb.match_mcc = mcc;
-	apndb.match_mnc = mnc;
-	apndb.match_spn = spn;
-	apndb.match_imsi = imsi;
-	apndb.match_gid1 = gid1;
-
-	if (android_apndb_parse(&toplevel_apndb_parser, &apndb,
-				error) == FALSE) {
-		g_slist_free_full(apndb.apns, android_apndb_ap_free);
-		apndb.apns = NULL;
-	}
-
-	*mvno_found = apndb.mvno_found;
-
-	return apndb.apns;
-}
 
=== removed file 'plugins/android-apndb.h'
--- plugins/android-apndb.h	2014-04-14 13:59:23 +0000
+++ plugins/android-apndb.h	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *                2013 Simon Busch <[e-mail]>
- *  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
- *
- */
-
-struct apndb_provision_data {
-	struct ofono_gprs_provision_data gprs_data;
-	gboolean mvno;
-};
-
-void android_apndb_ap_free(gpointer data);
-
-GSList *android_apndb_lookup_apn(const char *mcc, const char *mnc,
-			const char *spn, const char *imsi, const char *gid1,
-			gboolean *mvno_found, GError **error);
 
=== removed file 'plugins/android-provision.c'
--- plugins/android-provision.c	2014-05-13 17:15:55 +0000
+++ plugins/android-provision.c	1970-01-01 00:00:00 +0000
@@ -1,227 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *                2013 Simon Busch <[e-mail]>
- *  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 <errno.h>
-#include <string.h>
-
-#include <glib.h>
-
-#define OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/types.h>
-#include <ofono/log.h>
-#include <ofono/plugin.h>
-#include <ofono/modem.h>
-#include <ofono/gprs-provision.h>
-
-#include "android-apndb.h"
-#include "mbpi.h"
-
-static unsigned int filter_apns(GSList **apns, GSList *mbpi_apns,
-				gboolean mvno_found)
-{
-	GSList *l = NULL;
-	GSList *l2 = NULL;
-	gboolean found = FALSE;
-	unsigned int ap_count = g_slist_length(*apns);
-	struct apndb_provision_data *ap;
-
-	if (mvno_found == TRUE) {
-
-		for (l = *apns; l;) {
-     			ap = l->data;
-			l = l->next;
-
-			if (ap->mvno == FALSE) {
-				DBG("Removing: %s", ap->gprs_data.apn);
-				*apns = g_slist_remove(*apns,
-							(gconstpointer) ap);
-				android_apndb_ap_free(ap);
-				ap_count--;
-			}
-		}
-
-		goto done;
-	}
-
-	for (l = mbpi_apns; l; l = l->next, found = FALSE) {
-		struct ofono_gprs_provision_data *ap2 = l->data;
-
-		if (ap2->apn == NULL) {
-			ofono_error("%s: invalid mbpi entry - %s found",
-					__func__, ap2->name);
-			continue;
-		}
-
-		for (l2 = *apns; l2; l2 = l2->next) {
-     			ap = l2->data;
-
-			if (ap->gprs_data.apn != NULL &&
-				ap->gprs_data.type ==
-				OFONO_GPRS_CONTEXT_TYPE_INTERNET &&
-				g_strcmp0(ap2->apn, ap->gprs_data.apn) == 0) {
-
-				found = TRUE;
-				break;
-			}
-		}
-
-		if (found == FALSE) {
-			DBG("Adding %s to apns", ap2->apn);
-
-			ap = g_try_new0(struct apndb_provision_data, 1);
-			if (ap == NULL) {
-				ofono_error("%s: out-of-memory trying to"
-						" provision APN - %s",
-						__func__, ap2->name);
-				goto done;
-			}
-
-			memcpy(&ap->gprs_data, ap2, sizeof(ap->gprs_data));
-			*apns = g_slist_append(*apns, ap);
-			ap_count++;
-			g_free(ap2);
-		} else {
-			mbpi_ap_free(ap2);
-		}
-	}
-
-done:
-	return ap_count;
-}
-
-static int provision_get_settings(const char *mcc, const char *mnc,
-				const char *spn,
-				const char *imsi, const char *gid1,
-				struct ofono_gprs_provision_data **settings,
-				int *count)
-{
-	GSList *apns = NULL;
-	GSList *mbpi_apns = NULL;
-	GSList *l = NULL;
-	GError *error = NULL;
-	gboolean mvno_found = FALSE;
-	unsigned int ap_count;
-	unsigned int i;
-
-	ofono_info("Provisioning for MCC %s, MNC %s, SPN '%s', IMSI '%s', "
-			"GID1 '%s'", mcc, mnc, spn, imsi, gid1);
-
-	apns = android_apndb_lookup_apn(mcc, mnc, spn, imsi, gid1,
-					&mvno_found, &error);
-	if (apns == NULL) {
-		if (error != NULL) {
-			ofono_error("%s: apndb_lookup error -%s for mcc %s"
-					" mnc %s spn %s imsi %s", __func__,
-					error->message, mcc, mnc, spn, imsi);
-			g_error_free(error);
-			error = NULL;
-		}
-	}
-
-	/* If an mvno apn was found, only provision mvno apns */
-	if (mvno_found == FALSE) {
-		mbpi_apns = mbpi_lookup_apn(mcc, mnc,
-					OFONO_GPRS_CONTEXT_TYPE_INTERNET,
-					TRUE, &error);
-		if (mbpi_apns == NULL) {
-			if (error != NULL) {
-				ofono_error("%s: MBPI error - %s for mcc %s"
-						" mnc %s spn: %s", __func__,
-						error->message, mcc, mnc, spn);
-				g_error_free(error);
-				error = NULL;
-			}
-		}
-	}
-
-	ap_count = filter_apns(&apns, mbpi_apns, mvno_found);
-	if (ap_count == 0) {
-		ofono_warn("%s: No APNs found for mcc %s mnc %s spn: %s"
-				" imsi: %s", __func__, mcc, mnc, spn, imsi);
-
-		*count = 0;
-		return -ENOENT;
-	}
-
-	*settings = g_try_new0(struct ofono_gprs_provision_data, ap_count);
-	if (*settings == NULL) {
-		ofono_error("%s: provisioning failed: %s", __func__,
-				g_strerror(errno));
-
-		g_slist_free_full(apns, android_apndb_ap_free);
-
-		*count = 0;
-		return -ENOMEM;
-	}
-
-	*count = ap_count;
-
-	for (l = apns, i = 0; l; l = l->next, i++) {
-		struct apndb_provision_data *ap = l->data;
-
-		DBG("Name: '%s'", ap->gprs_data.name);
-		DBG("APN: '%s'", ap->gprs_data.apn);
-		DBG("Type: %s", mbpi_ap_type(ap->gprs_data.type));
-		DBG("Username: '%s'", ap->gprs_data.username);
-		DBG("Password: '%s'", ap->gprs_data.password);
-		DBG("Message Proxy: '%s'", ap->gprs_data.message_proxy);
-		DBG("Message Center: '%s'", ap->gprs_data.message_center);
-		DBG("MVNO: %u", ap->mvno);
-
-		memcpy(*settings + i, &ap->gprs_data, sizeof(ap->gprs_data));
-
-		g_free(ap);
-	}
-
-	if (apns != NULL)
-		g_slist_free(apns);
-
-	if (mbpi_apns != NULL)
-		g_slist_free(mbpi_apns);
-
-	return 0;
-}
-
-static struct ofono_gprs_provision_driver android_provision_driver = {
-	.name		= "Android APN database Provisioning",
-	.get_settings	= provision_get_settings
-};
-
-static int android_provision_init(void)
-{
-	return ofono_gprs_provision_driver_register(&android_provision_driver);
-}
-
-static void android_provision_exit(void)
-{
-	ofono_gprs_provision_driver_unregister(&android_provision_driver);
-}
-
-OFONO_PLUGIN_DEFINE(android_provision,
-			"Android APN database Provisioning Plugin", VERSION,
-			OFONO_PLUGIN_PRIORITY_DEFAULT,
-			android_provision_init, android_provision_exit)
 
=== added file 'plugins/infineon.c'
--- plugins/infineon.c	1970-01-01 00:00:00 +0000
+++ plugins/infineon.c	2014-07-21 18:55:43 +0000
@@ -0,0 +1,76 @@
+/*
+ *
+ *  oFono - Open Source Telephony - RIL-based devices: infineon modems
+ *
+ *  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
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+
+#include "ofono.h"
+
+#include "drivers/rilmodem/vendor.h"
+#include "ril.h"
+
+static int inf_probe(struct ofono_modem *modem)
+{
+	return ril_create(modem, OFONO_RIL_VENDOR_INFINEON);
+}
+
+static struct ofono_modem_driver infineon_driver = {
+	.name = "infineon",
+	.probe = inf_probe,
+	.remove = ril_remove,
+	.enable = ril_enable,
+	.disable = ril_disable,
+	.pre_sim = ril_pre_sim,
+	.post_sim = ril_post_sim,
+	.post_online = ril_post_online,
+	.set_online = ril_set_online,
+};
+
+/*
+ * This plugin is a device plugin for infineon modems that use RIL interface.
+ * The plugin 'rildev' is used to determine which RIL plugin should be loaded
+ * based upon an environment variable.
+ */
+static int inf_init(void)
+{
+	int retval = 0;
+
+	if ((retval = ofono_modem_driver_register(&infineon_driver)))
+		DBG("ofono_modem_driver_register returned: %d", retval);
+
+	return retval;
+}
+
+static void inf_exit(void)
+{
+	DBG("");
+	ofono_modem_driver_unregister(&infineon_driver);
+}
+
+OFONO_PLUGIN_DEFINE(infineon, "Infineon modem driver", VERSION,
+			OFONO_PLUGIN_PRIORITY_DEFAULT, inf_init, inf_exit)
 
=== modified file 'plugins/mtk.c'
--- plugins/mtk.c	2014-06-12 10:52:45 +0000
+++ plugins/mtk.c	2014-07-21 18:55:43 +0000
@@ -92,6 +92,8 @@
 	int slot;
 	struct ril_sim_data sim_data;
 	struct ofono_devinfo *devinfo;
+	struct cb_data *pending_online_cbd;
+	ofono_bool_t pending_online;
 };
 
 /*
@@ -106,6 +108,8 @@
 static void send_get_sim_status(struct ofono_modem *modem);
 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 mtk_debug(const char *str, void *user_data)
 {
@@ -372,14 +376,23 @@
 	send_get_sim_status(modem);
 }
 
+static struct mtk_data *ril_complement(struct mtk_data *ril)
+{
+	if (ril->slot == MULTISIM_SLOT_0)
+		return mtk_1;
+	else
+		return mtk_0;
+}
+
 static void mtk_sim_mode_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 *ril_c;
 
-	ril->pending_cb = NULL;
+	mtk_0->pending_cb = NULL;
 
 	if (message->error == RIL_E_SUCCESS) {
 		g_ril_print_response_no_args(ril->modem, message);
@@ -390,6 +403,21 @@
 				ril_error_to_string(message->error));
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
 	}
+
+	/* Execute possible pending operation on the other modem */
+
+	ril_c = ril_complement(ril);
+
+	if (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;
+
+		mtk_set_online(pending_cbd->user, ril_c->pending_online,
+				pending_cb, pending_cbd->data);
+
+		g_free(ril_c->pending_online_cbd);
+		ril_c->pending_online_cbd = NULL;
+	}
 }
 
 static int sim_state()
@@ -484,6 +512,25 @@
 	ofono_modem_online_cb_t cb = cbd->cb;
 	int current_state, next_state;
 
+	/*
+	 * Serialize online requests to avoid incoherent states. When changing
+	 * the online state of *one* of the modems, we need to send a
+	 * DUAL_SIM_MODE_SWITCH request, which affects *both* modems. Also, when
+	 * we want to online one modem and at that time both modems are
+	 * offline a RADIO_POWERON needs to be sent before DUAL_SIM_MODE_SWITCH,
+	 * with the additional complexity of being disconnected from the rild
+	 * socket while doing the sequence. This can take some time, and we
+	 * cannot change the state of the other modem while the sequence is
+	 * happenig, as DUAL_SIM_MODE_SWITCH affects both states. Therefore, we
+	 * 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;
+		return;
+	}
+
 	current_state = sim_state();
 
 	ril->ofono_online = online;
 
=== modified file 'plugins/ril.c'
--- plugins/ril.c	2014-06-24 18:59:26 +0000
+++ plugins/ril.c	2014-07-21 18:55:43 +0000
@@ -60,6 +60,7 @@
 #include <grilrequest.h>
 #include <grilunsol.h>
 
+#include "ril.h"
 #include "drivers/rilmodem/rilmodem.h"
 #include "drivers/rilmodem/vendor.h"
 
@@ -69,6 +70,7 @@
 
 struct ril_data {
 	GRil *modem;
+	enum ofono_ril_vendor vendor;
 	int sim_status_retries;
 	ofono_bool_t connected;
 	ofono_bool_t have_sim;
@@ -118,7 +120,7 @@
 			if (ril->voice == NULL)
 				ril->voice =
 					ofono_voicecall_create(modem,
-								0,
+								ril->vendor,
 								RILMODEM,
 								ril->modem);
 
@@ -205,7 +207,7 @@
 			sim_status_cb, modem, NULL);
 }
 
-static int ril_probe(struct ofono_modem *modem)
+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) {
@@ -215,6 +217,7 @@
 
 	DBG("");
 
+	ril->vendor = vendor;
 	ril->have_sim = FALSE;
 	ril->ofono_online = FALSE;
 	ril->radio_state = RADIO_STATE_OFF;
@@ -229,11 +232,15 @@
 	return -errno;
 }
 
-static void ril_remove(struct ofono_modem *modem)
+static int ril_probe(struct ofono_modem *modem)
+{
+	return ril_create(modem, OFONO_RIL_VENDOR_AOSP);
+}
+
+void ril_remove(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
-
 	ofono_modem_set_data(modem, NULL);
 
 	if (!ril)
@@ -244,24 +251,24 @@
 	g_free(ril);
 }
 
-static void ril_pre_sim(struct ofono_modem *modem)
+void ril_pre_sim(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct ril_sim_data sim_data;
 
 	DBG("");
 
-	ofono_devinfo_create(modem, 0, RILMODEM, ril->modem);
+	ofono_devinfo_create(modem, ril->vendor, RILMODEM, ril->modem);
 
 	sim_data.gril = ril->modem;
 	sim_data.modem = modem;
 	sim_data.ril_state_watch = NULL;
 
-	ril->sim = ofono_sim_create(modem, 0, RILMODEM, &sim_data);
+	ril->sim = ofono_sim_create(modem, ril->vendor, RILMODEM, &sim_data);
 	g_assert(ril->sim != NULL);
 }
 
-static void ril_post_sim(struct ofono_modem *modem)
+void ril_post_sim(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct ofono_gprs *gprs;
@@ -273,10 +280,11 @@
 	 *  - stk ( SIM toolkit )
 	 *  - radio_settings
 	 */
-	ofono_sms_create(modem, 0, RILMODEM, ril->modem);
+	ofono_sms_create(modem, ril->vendor, RILMODEM, ril->modem);
 
-	gprs = ofono_gprs_create(modem, 0, RILMODEM, ril->modem);
-	gc = ofono_gprs_context_create(modem, 0, RILMODEM, ril->modem);
+	gprs = ofono_gprs_create(modem, ril->vendor, RILMODEM, ril->modem);
+	gc = ofono_gprs_context_create(modem, ril->vendor,
+					RILMODEM, ril->modem);
 
 	if (gc) {
 		ofono_gprs_context_set_type(gc,
@@ -284,7 +292,8 @@
 		ofono_gprs_add_context(gprs, gc);
 	}
 
-	gc = ofono_gprs_context_create(modem, 0, RILMODEM, ril->modem);
+	gc = ofono_gprs_context_create(modem, ril->vendor,
+					RILMODEM, ril->modem);
 
 	if (gc) {
 		ofono_gprs_context_set_type(gc,
@@ -296,19 +305,19 @@
 	if (mw)
 		ofono_message_waiting_register(mw);
 
-	ofono_call_forwarding_create(modem, 0, RILMODEM, ril->modem);
+	ofono_call_forwarding_create(modem, ril->vendor, RILMODEM, ril->modem);
 }
 
-static void ril_post_online(struct ofono_modem *modem)
+void ril_post_online(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
-	ofono_call_volume_create(modem, 0, RILMODEM, ril->modem);
-	ofono_netreg_create(modem, 0, RILMODEM, ril->modem);
-	ofono_ussd_create(modem, 0, RILMODEM, ril->modem);
-	ofono_call_settings_create(modem, 0, RILMODEM, ril->modem);
-	ofono_radio_settings_create(modem, 0, RILMODEM, ril->modem);
-	ofono_call_barring_create(modem, 0, RILMODEM, ril->modem);
+	ofono_call_volume_create(modem, ril->vendor, RILMODEM, ril->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_radio_settings_create(modem, ril->vendor, RILMODEM, ril->modem);
+	ofono_call_barring_create(modem, ril->vendor, RILMODEM, ril->modem);
 }
 
 static void ril_set_online_cb(struct ril_msg *message, gpointer user_data)
@@ -354,8 +363,8 @@
 	}
 }
 
-static void ril_set_online(struct ofono_modem *modem, ofono_bool_t online,
-				ofono_modem_online_cb_t callback, void *data)
+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);
@@ -417,7 +426,7 @@
 	return 0;
 }
 
-static int ril_enable(struct ofono_modem *modem)
+int ril_enable(struct ofono_modem *modem)
 {
 	int ret;
 
@@ -430,7 +439,7 @@
 	return -EINPROGRESS;
 }
 
-static int ril_disable(struct ofono_modem *modem)
+int ril_disable(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
 
=== added file 'plugins/ril.h'
--- plugins/ril.h	1970-01-01 00:00:00 +0000
+++ plugins/ril.h	2014-07-21 18:55:43 +0000
@@ -0,0 +1,30 @@
+/*
+ *
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  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
+ *
+ */
+
+int ril_create(struct ofono_modem *modem, enum ofono_ril_vendor vendor);
+void ril_remove(struct ofono_modem *modem);
+int ril_enable(struct ofono_modem *modem);
+int ril_disable(struct ofono_modem *modem);
+void ril_pre_sim(struct ofono_modem *modem);
+void ril_post_sim(struct ofono_modem *modem);
+void ril_post_online(struct ofono_modem *modem);
+void ril_set_online(struct ofono_modem *modem, ofono_bool_t online,
+			ofono_modem_online_cb_t callback, void *data);
 
=== added file 'plugins/ubuntu-apndb.c'
--- plugins/ubuntu-apndb.c	1970-01-01 00:00:00 +0000
+++ plugins/ubuntu-apndb.c	2014-07-21 18:55:43 +0000
@@ -0,0 +1,596 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *                2013 Simon Busch <[e-mail]>
+ *  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 <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <glib.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/modem.h>
+#include <ofono/gprs-provision.h>
+#include <ofono/log.h>
+
+#include "ubuntu-apndb.h"
+
+#ifndef SYSTEM_APNDB_PATH
+#define SYSTEM_APNDB_PATH     "/system/etc/apns-conf.xml"
+#define CUSTOM_APNDB_PATH     "/custom/etc/apns-conf.xml"
+#endif
+
+struct apndb_data {
+	const char *match_mcc;
+	const char *match_mnc;
+	const char *match_imsi;
+	const char *match_spn;
+	const char *match_gid1;
+	GSList *apns;
+	gboolean allow_duplicates;
+	gboolean mvno_found;
+};
+
+void ubuntu_apndb_ap_free(gpointer data)
+{
+	struct apndb_provision_data *ap = data;
+
+	g_free(ap->gprs_data.name);
+	g_free(ap->gprs_data.apn);
+	g_free(ap->gprs_data.username);
+	g_free(ap->gprs_data.password);
+	g_free(ap->gprs_data.message_proxy);
+	g_free(ap->gprs_data.message_center);
+
+	g_free(ap);
+}
+
+static gboolean imsi_match(const char *imsi, const char *match)
+{
+	gboolean result = FALSE;
+	size_t imsi_len = strlen(imsi);
+	size_t match_len = strlen(match);
+	unsigned int i;
+
+	DBG("imsi %s match %s", imsi, match);
+
+	if (imsi_len != match_len)
+		goto done;
+
+	for (i = 0; i < imsi_len; i++) {
+		if (*(imsi + i) == *(match + i))
+			continue;
+		else if (*(match + i) == 'x')
+			continue;
+		else
+			goto done;
+	}
+
+	result = TRUE;
+
+done:
+	return result;
+}
+
+static void strip_non_mvno_apns(GSList **apns)
+{
+	GSList *l = NULL;
+	unsigned int ap_count = g_slist_length(*apns);
+	struct apndb_provision_data *ap;
+
+	DBG("");
+
+	for (l = *apns; l;) {
+		ap = l->data;
+		l = l->next;
+
+		if (ap->mvno == FALSE) {
+			DBG("Removing: %s", ap->gprs_data.apn);
+			*apns = g_slist_remove(*apns,
+						(gconstpointer) ap);
+			ubuntu_apndb_ap_free(ap);
+			ap_count--;
+		}
+	}
+}
+
+static GSList *merge_apn_lists(GSList *custom_apns, GSList *base_apns)
+{
+	GSList *l = NULL;
+	GSList *l2 = NULL;
+	gboolean found = FALSE;
+	struct apndb_provision_data *ap;
+
+	DBG("");
+
+	if (custom_apns == NULL)
+		return base_apns;
+
+	for (l = custom_apns; l; l = l->next, found = FALSE) {
+		struct apndb_provision_data *ap2 = l->data;
+
+		if (ap2->gprs_data.apn == NULL) {
+			ofono_error("%s: invalid custom apn entry - %s found",
+					__func__, ap2->gprs_data.name);
+			continue;
+		}
+
+		for (l2 = base_apns; l2; l2 = l2->next) {
+			ap = l2->data;
+
+			if (ap->gprs_data.apn != NULL &&
+				ap->gprs_data.type == ap2->gprs_data.type &&
+				g_strcmp0(ap2->gprs_data.apn,
+						ap->gprs_data.apn) == 0) {
+
+				found = TRUE;
+				break;
+			}
+		}
+
+		if (found == TRUE) {
+			DBG("found=TRUE; removing '%s'", ap->gprs_data.apn);
+
+			base_apns = g_slist_remove(base_apns, ap);
+			ubuntu_apndb_ap_free(ap);
+		}
+	}
+
+	custom_apns = g_slist_reverse(custom_apns);
+
+	for (l = custom_apns; l; l = l->next) {
+		struct ap2 *ap2 = l->data;
+
+		base_apns = g_slist_prepend(base_apns, ap2);
+	}
+
+	g_slist_free(custom_apns);
+
+	return base_apns;
+}
+
+static enum ofono_gprs_context_type determine_apn_type(const char *types)
+{
+	/*
+	 * The database contains entries with the following type field contents:
+	 * - default
+	 * - default,mms
+	 * - default,supl
+	 * - defualt,supl,dun
+	 * - default,supl,mms
+	 * - mms
+	 */
+
+	if (g_strcmp0(types, "mms") == 0)
+		return OFONO_GPRS_CONTEXT_TYPE_MMS;
+	else if (g_str_has_prefix(types, "default"))
+		return OFONO_GPRS_CONTEXT_TYPE_INTERNET;
+	else
+		return OFONO_GPRS_CONTEXT_TYPE_ANY;
+}
+
+static char *ubuntu_apndb_sanitize_ipv4_address(const char *address)
+{
+	char **numbers = NULL;
+	char *sanitized_numbers[4];
+	unsigned int count = 0;
+	char *result = NULL;
+	char *numeral;
+
+	/*
+	 * As src/gprs.c expects MMS proxies to always be
+	 * specified using IPV4 numbers-and-dot notation,
+	 * we need to strip any leading "0"s from the
+	 * individual numeric components, otherwise they
+	 * will be treated as octal numbers
+	 * ( see 'man inet_aton' for details ).
+	 */
+
+	if (g_ascii_isdigit(*address) == FALSE)
+		goto done;
+
+	numbers = g_strsplit(address, ".", 4);
+
+	for (; (numeral = *(numbers+count)); count++) {
+		if (count > 3)
+			goto done;
+
+		for (; *numeral; numeral++) {
+			if (g_ascii_isdigit(*numeral) == FALSE)
+				goto done;
+			else if (*numeral == '0')
+				continue;
+			else
+				break;
+		}
+
+		if (*numeral)
+			sanitized_numbers[count] = numeral;
+		else
+			sanitized_numbers[count] = "0";
+	}
+
+	if (count != 4)
+		goto done;
+
+	result = g_strdup_printf("%s.%s.%s.%s",
+					sanitized_numbers[0],
+					sanitized_numbers[1],
+					sanitized_numbers[2],
+					sanitized_numbers[3]);
+
+done:
+	if (numbers != NULL)
+		g_strfreev(numbers);
+
+	return result;
+}
+
+static void toplevel_apndb_start(GMarkupParseContext *context,
+					const gchar *element_name,
+					const gchar **attribute_names,
+					const gchar **attribute_values,
+					gpointer userdata, GError **error)
+{
+	struct apndb_data *apndb = userdata;
+	struct apndb_provision_data *ap = NULL;
+	int i;
+	const gchar *carrier = NULL;
+	const gchar *mcc = NULL;
+	const gchar *mnc = NULL;
+	const gchar *apn = NULL;
+	const gchar *username = NULL;
+	const gchar *password = NULL;
+	const gchar *types = NULL;
+	const gchar *protocol = NULL;
+	const gchar *mmsproxy = NULL;
+	const gchar *mmsport = NULL;
+	const gchar *mmscenter = NULL;
+	const gchar *mvnomatch = NULL;
+	const gchar *mvnotype = NULL;
+	enum ofono_gprs_proto proto = OFONO_GPRS_PROTO_IP;
+	enum ofono_gprs_context_type type;
+
+	if (g_strcmp0(element_name, "apn") != 0)
+		return;
+
+	for (i = 0; attribute_names[i]; i++) {
+		if (g_strcmp0(attribute_names[i], "carrier") == 0)
+			carrier = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "mcc") == 0)
+			mcc = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "mnc") == 0)
+			mnc = attribute_values[i];
+	}
+
+	if (mcc == NULL) {
+		ofono_error("%s: apn for %s missing 'mcc' attribute", __func__,
+				carrier);
+		return;
+	}
+
+	if (mnc == NULL) {
+		ofono_error("%s: apn for %s missing 'mnc' attribute", __func__,
+				carrier);
+		return;
+	}
+
+	if (g_strcmp0(mcc, apndb->match_mcc) != 0 ||
+		g_strcmp0(mnc, apndb->match_mnc) != 0)
+		return;
+
+	for (i = 0; attribute_names[i]; i++) {
+		if (g_strcmp0(attribute_names[i], "apn") == 0)
+			apn = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "user") == 0)
+			username = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "password") == 0)
+			password = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "type") == 0)
+			types = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "protocol") == 0)
+			protocol = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "mmsc") == 0)
+			mmscenter = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "mmsproxy") == 0)
+			mmsproxy = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "mmsport") == 0)
+			mmsport = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "mvno_match_data") == 0)
+			mvnomatch = attribute_values[i];
+		else if (g_strcmp0(attribute_names[i], "mvno_type") == 0)
+			mvnotype = attribute_values[i];
+	}
+
+	if (apn == NULL) {
+		ofono_error("%s: apn for %s missing 'apn' attribute", __func__,
+				carrier);
+		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;
+		} else if (g_strcmp0(protocol, "IPV6") == 0) {
+			proto = OFONO_GPRS_PROTO_IPV6;
+		} else if (g_strcmp0(protocol, "IPV4V6") == 0) {
+			proto = OFONO_GPRS_PROTO_IPV4V6;
+		} else {
+			ofono_error("%s: APN %s has invalid protocol=%s"
+					"attribute", __func__, carrier,
+					protocol);
+			return;
+		}
+	}
+
+	if (mvnotype != NULL && mvnomatch != NULL) {
+
+		if (g_strcmp0(mvnotype, "imsi") == 0) {
+			DBG("APN %s is mvno_type 'imsi'", carrier);
+
+			if (apndb->match_imsi == NULL ||
+					imsi_match(apndb->match_imsi,
+							mvnomatch) == FALSE) {
+				DBG("Skipping MVNO 'imsi' APN %s with"
+					" match_data: %s", carrier, mvnomatch);
+				return;
+			}
+		} else if (g_strcmp0(mvnotype, "spn") == 0) {
+			DBG("APN %s is mvno_type 'spn'", carrier);
+
+			if (g_strcmp0(mvnomatch, apndb->match_spn) != 0) {
+				DBG("Skipping mvno 'spn' APN %s with"
+					" match_data: %s", carrier, mvnomatch);
+				return;
+			}
+
+		} else if (g_strcmp0(mvnotype, "gid") == 0) {
+			int match_len = strlen(mvnomatch);
+
+			DBG("APN %s is mvno_type 'gid'", carrier);
+
+			/* Check initial part of GID1 against match data */
+			if (apndb->match_gid1 == NULL ||
+					g_ascii_strncasecmp(mvnomatch,
+							apndb->match_gid1,
+							match_len) != 0) {
+				DBG("Skipping mvno 'gid' APN %s with"
+					" match_data: %s", carrier, mvnomatch);
+				return;
+			}
+		}
+	}
+
+	type = determine_apn_type(types);
+
+	if (type == OFONO_GPRS_CONTEXT_TYPE_ANY ||
+		(type == OFONO_GPRS_CONTEXT_TYPE_MMS && mmsproxy == NULL)) {
+		DBG("Skipping %s context; types: %s", apn, types);
+		return;
+	}
+
+	ap = g_try_new0(struct apndb_provision_data, 1);
+	if (ap == NULL) {
+		ofono_error("%s: out-of-memory trying to provision APN - %s",
+				__func__, carrier);
+		return;
+	}
+
+	ap->gprs_data.type = type;
+
+	if (carrier != NULL)
+		ap->gprs_data.name = g_strdup(carrier);
+
+	if (apn != NULL)
+		ap->gprs_data.apn = g_strdup(apn);
+
+	if (username != NULL)
+		ap->gprs_data.username = g_strdup(username);
+
+	if (password != NULL)
+		ap->gprs_data.password = g_strdup(password);
+
+	if (mmscenter != NULL && strlen(mmscenter) > 0)
+		ap->gprs_data.message_center = g_strdup(mmscenter);
+
+	if (mmsproxy != NULL && strlen(mmsproxy) > 0) {
+		char *tmp = ubuntu_apndb_sanitize_ipv4_address(mmsproxy);
+		if (tmp != NULL)
+			mmsproxy = tmp;
+
+		if (mmsport != NULL)
+			ap->gprs_data.message_proxy =
+				g_strdup_printf("%s:%s", mmsproxy, mmsport);
+		else
+			ap->gprs_data.message_proxy = g_strdup(mmsproxy);
+
+		g_free(tmp);
+	}
+
+	ap->gprs_data.proto = proto;
+
+	if (mvnotype != NULL) {
+		ap->mvno = TRUE;
+		apndb->mvno_found = TRUE;
+	}
+
+	apndb->apns = g_slist_append(apndb->apns, ap);
+}
+
+static void toplevel_apndb_end(GMarkupParseContext *context,
+					const gchar *element_name,
+					gpointer userdata, GError **error)
+{
+}
+
+static const GMarkupParser toplevel_apndb_parser = {
+	toplevel_apndb_start,
+	toplevel_apndb_end,
+	NULL,
+	NULL,
+	NULL,
+};
+
+static gboolean ubuntu_apndb_parse(const GMarkupParser *parser,
+					gpointer userdata,
+					const char *apndb_path,
+					GError **error)
+{
+	struct stat st;
+	char *db;
+	int fd;
+	GMarkupParseContext *context;
+	gboolean ret;
+
+	fd = open(apndb_path, O_RDONLY);
+	if (fd < 0) {
+		g_set_error(error, G_FILE_ERROR,
+				g_file_error_from_errno(errno),
+				"open(%s) failed: %s", apndb_path,
+				g_strerror(errno));
+		return FALSE;
+	}
+
+	if (fstat(fd, &st) < 0) {
+		close(fd);
+		g_set_error(error, G_FILE_ERROR,
+				g_file_error_from_errno(errno),
+				"fstat(%s) failed: %s", apndb_path,
+				g_strerror(errno));
+		return FALSE;
+	}
+
+	db = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+	if (db == MAP_FAILED) {
+		close(fd);
+		g_set_error(error, G_FILE_ERROR,
+				g_file_error_from_errno(errno),
+				"mmap(%s) failed: %s", apndb_path,
+				g_strerror(errno));
+		return FALSE;
+	}
+
+	context = g_markup_parse_context_new(parser,
+						G_MARKUP_TREAT_CDATA_AS_TEXT,
+						userdata, NULL);
+
+	ret = g_markup_parse_context_parse(context, db, st.st_size, error);
+
+	if (ret == TRUE)
+		g_markup_parse_context_end_parse(context, error);
+
+	munmap(db, st.st_size);
+	close(fd);
+	g_markup_parse_context_free(context);
+
+	return ret;
+}
+
+GSList *ubuntu_apndb_lookup_apn(const char *mcc, const char *mnc,
+			const char *spn, const char *imsi, const char *gid1,
+			GError **error)
+{
+	struct apndb_data apndb = { NULL };
+	struct apndb_data custom_apndb = { NULL };
+	const char *apndb_path;
+	GSList *merged_apns;
+
+	/*
+	 * Lookup /custom apns first, if mvno apns found,
+	 * strip non-mvno apns from list
+	 *
+	 * Lookup /system next, apply same mvno logic...
+	 *
+	 * Merge both lists, any custom apns that match the type
+	 * and apn fields of a /system apn replace it.
+	 */
+
+	custom_apndb.match_mcc = mcc;
+	custom_apndb.match_mnc = mnc;
+	custom_apndb.match_spn = spn;
+	custom_apndb.match_imsi = imsi;
+	custom_apndb.match_gid1 = gid1;
+
+	if ((apndb_path = getenv("OFONO_CUSTOM_APNDB_PATH")) == NULL)
+		apndb_path = CUSTOM_APNDB_PATH;
+
+	if (ubuntu_apndb_parse(&toplevel_apndb_parser, &custom_apndb,
+				apndb_path,
+				error) == FALSE) {
+		g_slist_free_full(custom_apndb.apns, ubuntu_apndb_ap_free);
+		custom_apndb.apns = NULL;
+
+		if (*error) {
+			if ((*error)->domain != G_FILE_ERROR)
+				ofono_error("%s: custom apn_lookup error -%s",
+						__func__, (*error)->message);
+
+			g_error_free(*error);
+			*error = NULL;
+		}
+	}
+
+	if (custom_apndb.apns && custom_apndb.mvno_found)
+		strip_non_mvno_apns(&custom_apndb.apns);
+
+	DBG("custom_apndb: found '%d' APNs", g_slist_length(custom_apndb.apns));
+
+	apndb.match_mcc = mcc;
+	apndb.match_mnc = mnc;
+	apndb.match_spn = spn;
+	apndb.match_imsi = imsi;
+	apndb.match_gid1 = gid1;
+
+	if ((apndb_path = getenv("OFONO_SYSTEM_APNDB_PATH")) == NULL)
+		apndb_path = SYSTEM_APNDB_PATH;
+
+	if (ubuntu_apndb_parse(&toplevel_apndb_parser, &apndb,
+				apndb_path,
+				error) == FALSE) {
+		g_slist_free_full(apndb.apns, ubuntu_apndb_ap_free);
+		apndb.apns = NULL;
+	}
+
+	DBG("apndb: found '%d' APNs", g_slist_length(apndb.apns));
+
+	if (apndb.apns && apndb.mvno_found)
+		strip_non_mvno_apns(&apndb.apns);
+
+	merged_apns = merge_apn_lists(custom_apndb.apns, apndb.apns);
+
+	return merged_apns;
+}
 
=== added file 'plugins/ubuntu-apndb.h'
--- plugins/ubuntu-apndb.h	1970-01-01 00:00:00 +0000
+++ plugins/ubuntu-apndb.h	2014-07-21 18:55:43 +0000
@@ -0,0 +1,33 @@
+/*
+ *
+ *  ofono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *                2013 Simon Busch <[e-mail]>
+ *  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
+ *
+ */
+
+struct apndb_provision_data {
+	struct ofono_gprs_provision_data gprs_data;
+	gboolean mvno;
+};
+
+void ubuntu_apndb_ap_free(gpointer data);
+
+GSList *ubuntu_apndb_lookup_apn(const char *mcc, const char *mnc,
+			const char *spn, const char *imsi, const char *gid1,
+			GError **error);
 
=== added file 'plugins/ubuntu-provision.c'
--- plugins/ubuntu-provision.c	1970-01-01 00:00:00 +0000
+++ plugins/ubuntu-provision.c	2014-07-21 18:55:43 +0000
@@ -0,0 +1,150 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *                2013 Simon Busch <[e-mail]>
+ *  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 <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/types.h>
+#include <ofono/log.h>
+#include <ofono/plugin.h>
+#include <ofono/modem.h>
+#include <ofono/gprs-provision.h>
+
+#include "ubuntu-apndb.h"
+#include "mbpi.h"
+
+static int provision_get_settings(const char *mcc, const char *mnc,
+				const char *spn,
+				const char *imsi, const char *gid1,
+				struct ofono_gprs_provision_data **settings,
+				int *count)
+{
+	GSList *apns = NULL;
+	GSList *l = NULL;
+	GError *error = NULL;
+	unsigned int i;
+	char *tmp;
+	int retval = 0;
+
+	if ((tmp = getenv("OFONO_CUSTOM_MCC")) != NULL)
+		mcc = tmp;
+
+	if ((tmp = getenv("OFONO_CUSTOM_MNC")) != NULL)
+		mnc = tmp;
+
+	if ((tmp = getenv("OFONO_CUSTOM_SPN")) != NULL)
+		spn = tmp;
+
+	if ((tmp = getenv("OFONO_CUSTOM_IMSI")) != NULL)
+		imsi = tmp;
+
+	if ((tmp = getenv("OFONO_CUSTOM_GID1")) != NULL)
+		gid1 = tmp;
+
+	ofono_info("Provisioning for MCC %s, MNC %s, SPN '%s', IMSI '%s', "
+			"GID1 '%s'", mcc, mnc, spn, imsi, gid1);
+
+	apns = ubuntu_apndb_lookup_apn(mcc, mnc, spn, imsi, gid1, &error);
+	if (apns == NULL) {
+		if (error != NULL) {
+			ofono_error("%s: apndb_lookup error -%s for mcc %s"
+					" mnc %s spn %s imsi %s", __func__,
+					error->message, mcc, mnc, spn, imsi);
+			g_error_free(error);
+			error = NULL;
+		}
+	}
+
+	*count = g_slist_length(apns);
+
+	DBG("ap_count: '%d'", *count);
+
+	if (*count == 0) {
+		ofono_error("%s: provisioning failed - no APNs found.",
+				__func__);
+
+		retval = -1;
+		goto done;
+	}
+
+	*settings = g_try_new0(struct ofono_gprs_provision_data, *count);
+	if (*settings == NULL) {
+		ofono_error("%s: provisioning failed: out-of-memory", __func__);
+
+		g_slist_free_full(apns, ubuntu_apndb_ap_free);
+
+		*count = 0;
+		return -ENOMEM;
+	}
+
+	for (l = apns, i = 0; l; l = l->next, i++) {
+		struct apndb_provision_data *ap = l->data;
+
+		DBG("Name: '%s'", ap->gprs_data.name);
+		DBG("APN: '%s'", ap->gprs_data.apn);
+		DBG("Type: %s", mbpi_ap_type(ap->gprs_data.type));
+		DBG("Username: '%s'", ap->gprs_data.username);
+		DBG("Password: '%s'", ap->gprs_data.password);
+		DBG("Message Proxy: '%s'", ap->gprs_data.message_proxy);
+		DBG("Message Center: '%s'", ap->gprs_data.message_center);
+		DBG("MVNO: %u", ap->mvno);
+
+		memcpy(*settings + i, &ap->gprs_data, sizeof(ap->gprs_data));
+
+		g_free(ap);
+	}
+
+done:
+	if (apns != NULL)
+		g_slist_free(apns);
+
+	return retval;
+}
+
+static struct ofono_gprs_provision_driver ubuntu_provision_driver = {
+	.name		= "Ubuntu APN database Provisioning",
+	.get_settings	= provision_get_settings
+};
+
+static int ubuntu_provision_init(void)
+{
+	return ofono_gprs_provision_driver_register(&ubuntu_provision_driver);
+}
+
+static void ubuntu_provision_exit(void)
+{
+	ofono_gprs_provision_driver_unregister(&ubuntu_provision_driver);
+}
+
+OFONO_PLUGIN_DEFINE(ubuntu_provision,
+			"Ubuntu APN database Provisioning Plugin", VERSION,
+			OFONO_PLUGIN_PRIORITY_DEFAULT,
+			ubuntu_provision_init, ubuntu_provision_exit)
 
=== modified file 'test/rilmodem/test-sim-online'
--- test/rilmodem/test-sim-online	2014-06-24 18:59:26 +0000
+++ test/rilmodem/test-sim-online	2014-07-21 18:55:43 +0000
@@ -193,7 +193,8 @@
 	assert properties["Model"] == "Fake Modem Model"
 	assert properties["Type"] == "hardware"
 
-	assert properties["Serial"] == "000000000000000"
+	if args.emulator:
+		assert properties["Serial"] == "000000000000000"
 
 	assert properties["Manufacturer"] == "Fake Manufacturer"
 
 
=== modified file 'unit/test-grilreply.c'
--- unit/test-grilreply.c	2014-05-13 01:21:09 +0000
+++ unit/test-grilreply.c	2014-07-21 18:55:43 +0000
@@ -79,6 +79,12 @@
 	const struct ril_msg msg;
 };
 
+struct oem_hook_raw_test {
+	const unsigned char *data;
+	int size;
+	const struct ril_msg msg;
+};
+
 /* Invalid RIL_REQUEST_DATA_REGISTRATION_STATE: buffer too small */
 static const struct ril_msg reply_data_reg_state_invalid_1 = {
 	.buf = "XYZ",
@@ -1451,6 +1457,49 @@
 	}
 };
 
+/*
+ * The following structure contains test data for a valid
+ * RIL_REQUEST_OEM_HOOK_RAW reply with parameter {4,0x11111111}
+ */
+static const guchar reply_oem_hook_raw_valid_parcel1[] = {
+	0x04, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11
+};
+
+static const struct oem_hook_raw_test reply_oem_hook_raw_valid_1 = {
+	.data = reply_oem_hook_raw_valid_parcel1 + sizeof(int32_t),
+	.size = (int) (sizeof(reply_oem_hook_raw_valid_parcel1)
+			- sizeof(int32_t)),
+	.msg = {
+		.buf = (gchar *) reply_oem_hook_raw_valid_parcel1,
+		.buf_len = sizeof(reply_oem_hook_raw_valid_parcel1),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_OEM_HOOK_RAW,
+		.serial_no = 0,
+		.error = RIL_E_SUCCESS,
+	}
+};
+
+/*
+ * The following structure contains test data for a valid
+ * RIL_REQUEST_OEM_HOOK_RAW reply with parameter {-1}
+ */
+static const guchar reply_oem_hook_raw_valid_parcel2[] = {
+	0xFF, 0xFF, 0xFF, 0xFF
+};
+
+static const struct oem_hook_raw_test reply_oem_hook_raw_valid_2 = {
+	.data = NULL,
+	.size = -1,
+	.msg = {
+		.buf = (gchar *) reply_oem_hook_raw_valid_parcel2,
+		.buf_len = sizeof(reply_oem_hook_raw_valid_parcel2),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_OEM_HOOK_RAW,
+		.serial_no = 0,
+		.error = RIL_E_SUCCESS,
+	}
+};
+
 static void test_reply_reg_state_invalid(gconstpointer data)
 {
 	struct reply_reg_state *reply =	g_ril_reply_parse_reg_state(NULL, data);
@@ -1669,6 +1718,19 @@
 	g_free(retries);
 }
 
+static void test_reply_oem_hook_raw_valid(gconstpointer data)
+{
+	const struct oem_hook_raw_test *test = data;
+	struct reply_oem_hook *reply =
+		g_ril_reply_oem_hook_raw(NULL, &test->msg);
+
+	g_assert(reply->length == test->size);
+	if (reply->length >= 0)
+		g_assert(!memcmp(reply->data, test->data, test->size));
+	else
+		g_assert(reply->data == NULL);
+}
+
 #endif
 
 int main(int argc, char **argv)
@@ -1958,6 +2020,16 @@
 				&reply_enter_sim_pin_valid_2,
 				test_reply_enter_sim_pin_valid);
 
+	g_test_add_data_func("/testgrilreply/oem: "
+				"valid OEM_HOOK_RAW Test 1",
+				&reply_oem_hook_raw_valid_1,
+				test_reply_oem_hook_raw_valid);
+
+	g_test_add_data_func("/testgrilreply/oem: "
+				"valid OEM_HOOK_RAW Test 2",
+				&reply_oem_hook_raw_valid_2,
+				test_reply_oem_hook_raw_valid);
+
 #endif
 
 	return g_test_run();
 
=== modified file 'unit/test-grilrequest.c'
--- unit/test-grilrequest.c	2014-06-24 18:59:26 +0000
+++ unit/test-grilrequest.c	2014-07-21 18:55:43 +0000
@@ -790,6 +790,37 @@
 	.parcel_size = sizeof(req_change_barring_password_valid_1),
 };
 
+/* oem_hook_raw tests */
+
+struct request_test_oem_hook_raw_data {
+	const guchar *data;
+	gsize size;
+	const guchar *parcel_data;
+	gsize parcel_size;
+};
+
+static const guchar req_oem_hook_raw_valid_1[] = {
+	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_oem_hook_raw_data oem_hook_raw_valid_test_1 = {
+	.data = req_oem_hook_raw_valid_1 + sizeof(int32_t),
+	.size = sizeof(req_oem_hook_raw_valid_1) - sizeof(int32_t),
+	.parcel_data = (guchar *) &req_oem_hook_raw_valid_1,
+	.parcel_size = sizeof(req_oem_hook_raw_valid_1),
+};
+
+static const guchar req_oem_hook_raw_valid_2[] = {
+	0xFF, 0xFF, 0xFF, 0xFF
+};
+
+static const struct request_test_oem_hook_raw_data oem_hook_raw_valid_test_2 = {
+	.data = NULL,
+	.size = 0,
+	.parcel_data = (guchar *) &req_oem_hook_raw_valid_2,
+	.parcel_size = sizeof(req_oem_hook_raw_valid_2),
+};
+
 /*
  * The following hexadecimal data represents a serialized Binder parcel
  * instance containing a valid RIL_REQUEST_RADIO_POWER 'OFF' message.
@@ -1322,6 +1353,21 @@
 
 	parcel_free(&rilp);
 }
+
+static void test_request_oem_hook_raw(gconstpointer data)
+{
+	const struct request_test_oem_hook_raw_data *test_data = data;
+	struct parcel rilp;
+
+	g_ril_request_oem_hook_raw(NULL, test_data->data,
+					test_data->size, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,
+				test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
 #endif
 
 int main(int argc, char **argv)
@@ -1571,6 +1617,16 @@
 				&change_barring_password_valid_test_1,
 				test_request_change_barring_password);
 
+	g_test_add_data_func("/testgrilrequest/oem-hook-raw: "
+				"valid OEM_HOOK_RAW Test 1",
+				&oem_hook_raw_valid_test_1,
+				test_request_oem_hook_raw);
+
+	g_test_add_data_func("/testgrilrequest/oem-hook-raw: "
+				"valid OEM_HOOK_RAW Test 2",
+				&oem_hook_raw_valid_test_2,
+				test_request_oem_hook_raw);
+
 #endif
 	return g_test_run();
 }