Merge "APN updates for Europe" into lmp-dev
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 06b9e96..6194d98 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -3326,6 +3326,27 @@
       type="mms"
   />
 
+  <apn carrier="BT One Phone Internet"
+      mcc="234"
+      mnc="08"
+      apn="internet.btonephone.com"
+      mvno_type="gid"
+      mvno_match_data="B2"
+      type="default,supl"
+  />
+
+  <apn carrier="BT One Phone MMS"
+      mcc="234"
+      mnc="08"
+      apn="mms.btonephone.com"
+      mmsc="http://MMSC/"
+      mmsproxy="proxy.btonephone.com"
+      mmsport="8080"
+      mvno_type="gid"
+      mvno_match_data="B2"
+      type="mms"
+  />
+
   <apn carrier="O2 Mobile Web"
       mcc="234"
       mnc="10"
@@ -3553,14 +3574,14 @@
       mcc="234"
       mnc="15"
       apn="btmobile.bt.com"
-      authtype="0"
+      authtype="1"
       user="bt"
       password="bt"
       mmsc="http://mms.bt.com/servlets/mms"
       mmsproxy="212.183.137.12"
       mmsport="8799"
-      mvno_type="spn"
-      mvno_match_data="BT"
+      mvno_type="gid"
+      mvno_match_data="B3"
   />
 
   <apn carrier="Sainsbury's PAYG"
@@ -3656,6 +3677,81 @@
       type="mms"
   />
 
+  <apn carrier="BT One Phone Internet"
+      mcc="234"
+      mnc="30"
+      apn="internet.btonephone.com"
+      mvno_type="gid"
+      mvno_match_data="B2"
+      type="default,supl"
+  />
+
+  <apn carrier="BT One Phone MMS"
+      mcc="234"
+      mnc="30"
+      apn="mms.btonephone.com"
+      mmsc="http://MMSC/"
+      mmsproxy="proxy.btonephone.com"
+      mmsport="8080"
+      mvno_type="gid"
+      mvno_match_data="B2"
+      type="mms"
+  />
+
+  <apn carrier="BT Internet"
+      mcc="234"
+      mnc="30"
+      apn="btmobile.bt.com"
+      user="bt"
+      password="bt"
+      authtype="1"
+      mvno_type="gid"
+      mvno_match_data="B3"
+      type="default,supl"
+  />
+
+  <apn carrier="BT MMS"
+      mcc="234"
+      mnc="30"
+      apn="mms.bt.com"
+      user="bt"
+      password="bt"
+      authtype="1"
+      mmsc="http://MMS/"
+      mmsproxy="149.254.201.135"
+      mmsport="8080"
+      mvno_type="gid"
+      mvno_match_data="B3"
+      type="mms"
+  />
+
+  <apn carrier="BT Internet"
+      mcc="234"
+      mnc="30"
+      apn="btmobile.bt.com"
+      user="bt"
+      password="bt"
+      authtype="1"
+      mvno_type="gid"
+      mvno_match_data="C3"
+      type="default,supl"
+  />
+
+  <apn carrier="BT MMS"
+      mcc="234"
+      mnc="30"
+      apn="mms.bt.com"
+      user="bt"
+      password="bt"
+      authtype="1"
+      mmsc="http://MMS/"
+      mmsproxy="149.254.201.135"
+      mmsport="8080"
+      mvno_type="gid"
+      mvno_match_data="C3"
+      type="mms"
+  />
+
   <apn carrier="EE Internet"
       mcc="234"
       mnc="31"
@@ -5897,8 +5993,8 @@
       mmsc="http://10.81.0.7:8002"
       mmsproxy="82.113.100.6"
       mmsport="8080"
-      mvno_type="spn"
-      mvno_match_data="FONIC"
+      mvno_match_data="26207515"
+      mvno_type="imsi"
   />
 
   <apn carrier="Truphone"