am 5a37b767: Add sp-mode APN for Docomo (MCCMNC=44010). This APN is a standard APN for smart phone and is now available for open market devices. Dedupe b-mobile and IIJmio APNs. Add SoftBank 3G and SoftBank 4G.
am: 569c61f73d

* commit '569c61f73d560ce27fe8a86edd1df74ce8b5ba78':
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 78cb5ab..26e6bb8 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -354,7 +354,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  
+
   <apn carrier="MVNO NL"
      mcc="204"
      mnc="03"
@@ -622,6 +622,27 @@
       mvno_type="spn"
   />
 
+  <apn carrier="HOT mobile Internet"
+      mcc="204"
+      mnc="04"
+      apn="net.hotm"
+      type="default,supl"
+      mvno_match_data="HOT mobile"
+      mvno_type="spn"
+  />
+
+  <apn carrier="HOT mobile MMS"
+      mcc="204"
+      mnc="04"
+      apn="mms.hotm"
+      mmsc="http://mms.hotmobile.co.il"
+      mmsproxy="80.246.131.99"
+      mmsport="80"
+      type="mms"
+      mvno_match_data="HOT mobile"
+      mvno_type="spn"
+  />
+
   <apn carrier="Telfort Internet"
       mcc="204"
       mnc="12"
@@ -1280,16 +1301,46 @@
       mvno_match_data="12"
   />
 
+  <apn carrier="4G La Poste Mobile"
+      mcc="208"
+      mnc="10"
+      apn=""
+      type="ia"
+      mvno_match_data="4C"
+      mvno_type="gid"
+  />
+
+  <apn carrier="4G La Poste Mobile"
+      mcc="208"
+      mnc="10"
+      apn="sl2sfr"
+      mmsc="http://mms1"
+      mmsproxy="010.143.156.003"
+      mmsport="8080"
+      type="default,supl,mms"
+      mvno_match_data="4C"
+      mvno_type="gid"
+  />
+
   <apn carrier="WEB La Poste Mobile"
       mcc="208"
       mnc="10"
       proxy="192.168.21.3"
       port="8080"
-      apn="sl2sfr"
+      apn="wapdebitel"
+      type="default,supl"
+      mvno_match_data="4C"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MMS La Poste Mobile"
+      mcc="208"
+      mnc="10"
+      apn="mmsdebitel"
       mmsc="http://mmsdebitel"
       mmsproxy="10.143.156.3"
       mmsport="8080"
-      type="default,mms,supl"
+      type="mms"
       mvno_match_data="4C"
       mvno_type="gid"
   />
@@ -1540,6 +1591,14 @@
       type="mms"
   />
 
+  <apn carrier="IMS Vodafone"
+      mcc="214"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
   <apn carrier="Orange Internet Móvil"
       mcc="214"
       mnc="03"
@@ -1843,8 +1902,6 @@
       apn="telefonica.es"
       user="telefonica"
       password="telefonica"
-      proxy="10.138.255.133"
-      port="8080"
       mmsc="http://mms.movistar.com"
       mmsproxy="10.138.255.5"
       mmsport="8080"
@@ -1984,6 +2041,13 @@
   <apn carrier="Jazztel Internet"
       mcc="214"
       mnc="21"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Jazztel Internet"
+      mcc="214"
+      mnc="21"
       apn="jazzinternet"
       type="default,supl"
   />
@@ -2193,14 +2257,11 @@
       type="default,supl"
   />
 
-  <apn carrier="mtel"
+  <apn carrier="mtelgprs"
       mcc="218"
       mnc="05"
-      apn="mtelgprs1"
-      proxy="192.168.61.10"
-      port="80"
-      authtype="0"
-      type="default,supl,agps,fota,dun"
+      apn="3g1"
+      type="default,supl"
   />
 
   <apn carrier="mtelmms"
@@ -2209,25 +2270,27 @@
       apn="mtelmms"
       mmsc="http://mmsc.mtel.ba/mms/wapenc"
       mmsproxy="192.168.61.11"
-      mmsport="8080"
+      mmsport="80"
       type="mms"
   />
 
-  <apn carrier="Bh Mobile"
+  <apn carrier="BHMobileInternet"
       mcc="218"
       mnc="90"
       apn="active.bhmobile.ba"
       type="default,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="BHMobileMMS"
       mcc="218"
       mnc="90"
       apn="mms.bhmobile.ba"
-      mmsc="http://mms.bhmobile.ba/cmmsc/post"
+      mmsc="http://mms.bhmobile.ba/servlets/mms"
       mmsproxy="195.222.56.41"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
   />
 
   <apn carrier="T-Mobile MMS"
@@ -2614,6 +2677,7 @@
       mnc="10"
       apn=""
       type="ia"
+      protocol="IPV4V6"
   />
 
   <apn carrier="MMS Vodafone"
@@ -2642,6 +2706,14 @@
       type="dun"
   />
 
+  <apn carrier="IMS Vodafone"
+      mcc="222"
+      mnc="10"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
   <apn carrier="PosteMobile"
       mcc="222"
       mnc="10"
@@ -2963,6 +3035,15 @@
       mnc="01"
       apn=""
       type="ia"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile IMS"
+      mcc="230"
+      mnc="01"
+      apn="IMS"
+      type="ims"
+      protocol="IPV4V6"
   />
 
   <apn carrier="T-Mobile CZ"
@@ -3125,10 +3206,10 @@
       type="ia"
   />
 
-  <apn carrier="T-Mobile Internet"
+  <apn carrier="T-Mobile LTE"
       mcc="232"
       mnc="03"
-      apn="gprsinternet"
+      apn="internet.t-mobile.at"
       user="t-mobile"
       password="tm"
       authtype="1"
@@ -5786,6 +5867,7 @@
       mnc="01"
       apn=""
       type="ia"
+      protocol="IPV4V6"
   />
 
   <apn carrier="Telekom Internet"
@@ -5821,6 +5903,7 @@
       mnc="02"
       apn=""
       type="ia"
+      protocol="IPV4V6"
   />
 
   <apn carrier="Vodafone DE-MMS"
@@ -5840,6 +5923,14 @@
       type="default,supl"
   />
 
+  <apn carrier="Vodafone DE-IMS"
+      mcc="262"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
   <apn carrier="E-Plus Internet"
       mcc="262"
       mnc="03"
@@ -6333,22 +6424,23 @@
       type="mms"
   />
 
-  <apn carrier="GPRS GLOBUL"
+  <apn carrier="Telenor Internet"
       mcc="284"
       mnc="05"
-      apn="globul"
+      apn="telenorbg"
       authtype="1"
       proxy="192.168.88.11"
       port="8004"
       type="default,supl"
   />
 
-  <apn carrier="GLOBUL MMS GPRS"
+  <apn carrier="Telenor MMS"
       mcc="284"
       mnc="05"
-      apn="mms.globul.bg"
+      apn="mms"
       user="mms"
-      mmsc="http://mmsc1.mms.globul.bg:8002"
+      authtype="1"
+      mmsc="http://mmsc"
       mmsproxy="192.168.87.11"
       mmsport="8004"
       type="mms"
@@ -6882,8 +6974,8 @@
       mmsport="9201"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      mvno_match_data="2C"
-      mvno_type="gid"
+      mvno_type="spn"
+      mvno_match_data="MTS"
   />
 
   <apn carrier="MTS Tethering"
@@ -6893,8 +6985,8 @@
       type="dun"
       protocol="IPV4V6"
       roaming_protocol="IP"
-      mvno_type="gid"
-      mvno_match_data="2C"
+      mvno_type="spn"
+      mvno_match_data="MTS"
   />
 
   <apn carrier="chatr"
@@ -8363,6 +8455,8 @@
       mnc="090"
       apn="isp"
       type="default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="MMS"
@@ -8373,6 +8467,8 @@
       mmsproxy="12.108.12.13"
       mmsport="3128"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Edge MMS Prepay"
@@ -8383,6 +8479,8 @@
       mmsproxy="12.108.12.13"
       mmsport="3128"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="PLATMMS"
@@ -8570,6 +8668,8 @@
       mmsproxy="proxy.aiowireless.net"
       mmsport="80"
       type="default,mms,fota,hipri,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="T-Mobile US 160"
@@ -8622,6 +8722,8 @@
       mnc="170"
       apn="isp.cingular"
       type="default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Cingular MMS"
@@ -8634,6 +8736,8 @@
       mmsproxy="66.209.11.32"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="WCW-INTERNET"
@@ -9404,6 +9508,8 @@
       mmsc="http://mmsc.cingular.com/"
       mmsproxy="wireless.cingular.com"
       type="default,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="AWS MMS"
@@ -9414,6 +9520,8 @@
       mmsproxy="10.250.250.55"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Celloneet MMS"
@@ -9436,6 +9544,8 @@
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ATT Phone"
@@ -9446,6 +9556,8 @@
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ATT WAP"
@@ -9458,15 +9570,8 @@
       mmsc="http://mmsc.cingular.com/"
       mmsproxy="wireless.cingular.com"
       type="default,supl,mms"
-  />
-
- <apn carrier="ATT IMS"
-      mcc="310"
-      mnc="410"
-      apn="ims"
-      type="ims"
-      modem_cognitive="true"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Defense Mobile"
@@ -9848,6 +9953,8 @@
       mmsproxy="172.23.1.252"
       mmsport="8799"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Cellular One Smartphone"
@@ -9867,51 +9974,6 @@
       type="mms"
   />
 
-  <apn carrier="T-Mobile US 580"
-      mcc="310"
-      mnc="580"
-      apn=""
-      type="ia"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 580"
-      mcc="310"
-      mnc="580"
-      apn="fast.t-mobile.com"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mtu="1440"
-  />
-
-  <apn carrier="T-Mobile US 580 DUN"
-      mcc="310"
-      mnc="580"
-      apn="pcweb.tmobile.com"
-      user="none"
-      server="*"
-      password="none"
-      protocol="IP"
-      type="dun"
-      mtu="1440"
-  />
-
-  <apn carrier="MetroPCS 580"
-      mcc="310"
-      mnc="580"
-      apn="fast.metropcs.com"
-      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
-      type="default,supl,mms"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
   <apn carrier="inland"
       mcc="310"
       mnc="580"
@@ -13162,6 +13224,7 @@
       mmsc="http://mms.vtext.com/servlets/mms"
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"
+      user_visible="false"
   />
   <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="Verizon"
@@ -13174,6 +13237,7 @@
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"
       profile_id="1"
+      user_visible="false"
   />
 
   <!-- bearer 1, 2, 3, 9, 10, 11, 13, 14, 15 -->
@@ -13204,6 +13268,7 @@
       modem_cognitive="true"
       max_conns="1023"
       max_conns_time="300"
+      user_visible="false"
   />
 
   <!-- bearer 1, 2, 3, 9, 10, 11, 13, 14, 15 -->
@@ -13219,6 +13284,7 @@
       modem_cognitive="true"
       max_conns="1023"
       max_conns_time="300"
+      user_visible="false"
   />
 
   <!-- bearer 1, 2, 3, 9, 10, 11, 13, 14, 15 -->
@@ -13235,6 +13301,7 @@
       modem_cognitive="true"
       max_conns="1023"
       max_conns_time="300"
+      user_visible="false"
   />
 
   <!-- bearer 1, 2, 3, 9, 10, 11, 15, 16 -->
@@ -15185,20 +15252,7 @@
       mmsc="http://mmc.digiceltt.com/servlets/mms"
       mmsproxy="172.20.6.12"
       mmsport="8080"
-      type="default,supl,mms"
-  />
-
-  <apn carrier="French West Indies:Digicel:Modem"
-      mcc="340"
-      mnc="20"
-      apn="wap.digicelfr.com"
-      port="8080"
-      authtype="1"
-      proxy="172.20.6.12"
-      mmsc="http://wapdigicel.com"
-      type="dun"
-      user="wap"
-      password="wap"
+      type="default,mms,supl"
   />
 
   <apn carrier="Lime Internet Postpaid"
@@ -16418,6 +16472,13 @@
       type="mms"
   />
 
+  <apn carrier="ALTEL INTERNET"
+      mcc="401"
+      mnc="07"
+      apn="internet"
+      type="default,supl"
+  />
+
   <apn carrier="Tele2 Internet"
       mcc="401"
       mnc="77"
@@ -23711,19 +23772,11 @@
       mnc="01"
       apn="uwap.orange.co.il"
       mmsc="http://192.168.220.15/servlets/mms"
+      mmsproxy="192.118.11.55"
       mmsport="8080"
       type="default,supl,mms"
   />
 
-  <apn carrier="3G DUN"
-      mcc="425"
-      mnc="01"
-      apn="modem.orange.net.il"
-      type="dun"
-      authtype="0"
-      port="8080"
-  />
-
   <apn carrier="Cellcom Internet"
       mcc="425"
       mnc="02"
@@ -23853,7 +23906,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Alon Internet"
+  <apn carrier="YouPhone"
       mcc="425"
       mnc="14"
       apn="data.youphone.co.il"
@@ -24356,6 +24409,21 @@
       type="default,supl"
   />
 
+  <apn carrier="DCM"
+      mcc="440"
+      mnc="10"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="IMS"
+      mcc="440"
+      mnc="10"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+  />
+
   <apn carrier="sp-mode"
       mcc="440"
       mnc="10"
@@ -24419,33 +24487,23 @@
       authtype="2"
   />
 
-  <apn carrier="SoftBank 3G"
+  <apn carrier="SBM"
       mcc="440"
       mnc="20"
-      apn="plus.softbank"
-      user="plus"
-      password="softbank"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
-      type="default,mms,supl,hipri"
-      authtype="2"
+      apn=""
+      type="ia"
+      protocol="IP"
   />
 
-  <apn carrier="SoftBank 4G"
+  <apn carrier="IMS"
       mcc="440"
       mnc="20"
-      apn="plus.4g"
-      user="plus"
-      password="4g"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
-      type="default,mms,supl,hipri"
-      authtype="2"
+      apn="IMS"
+      type="ims"
+      protocol="IPV6"
   />
 
-  <apn carrier="Y! mobile"
+  <apn carrier="Application"
       mcc="440"
       mnc="20"
       apn="plus.acs.jp"
@@ -24458,6 +24516,23 @@
       authtype="2"
   />
 
+  <apn carrier="SKT IA"
+      mcc="450"
+      mnc="05"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="SKT IMS"
+      mcc="450"
+      mnc="05"
+      apn="IMS"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
   <apn carrier="SKT LTE INTERNET"
       mcc="450"
       mnc="05"
@@ -24467,6 +24542,7 @@
       mmsproxy="smart.nate.com"
       mmsport="9093"
       server="*"
+      protocol="IPV4V6"
   />
 
   <apn carrier="SKT 3G INTERNET"
@@ -24500,14 +24576,6 @@
       server="*"
   />
 
-  <apn carrier="KT"
-      mcc="450"
-      mnc="08"
-      apn="lte.ktfwing.com"
-      mmsc="http://mmsc.ktfwing.com:9082"
-      server="*"
-  />
-
   <apn carrier="SKT 3G INTERNET"
       mcc="450"
       mnc="11"
@@ -24539,11 +24607,20 @@
       server="*"
   />
 
+  <apn carrier="LG uplus IA"
+      mcc="450"
+      mnc="06"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+  />
+
   <apn carrier="LG uplus IMS"
       mcc="450"
       mnc="06"
-      apn="ims.lguplus.co.kr"
-      type="ia,ims"
+      apn="IMS"
+      type="ims"
       mmsc="http://omammsc.uplus.co.kr:9084"
       protocol="IPV4V6"
   />
@@ -24573,20 +24650,27 @@
       authtype="0"
   />
 
-  <apn carrier="KT LTE INTERNET"
+  <apn carrier="KT IA"
       mcc="450"
       mnc="08"
-      apn="lte150.ktfwing.com"
-      type="default,mms,supl,fota,cbs"
-      mmsc="http://mmsc.ktfwing.com:9082"
-      port="80"
-      server="*"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
   />
 
-  <apn carrier="KT 3G INTERNET"
+  <apn carrier="KT IMS"
       mcc="450"
       mnc="08"
-      apn="alwayson-r6.ktfwing.com"
+      apn="IMS"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="KT"
+      mcc="450"
+      mnc="08"
+      apn="lte.ktfwing.com"
       type="default,mms,supl,fota,cbs"
       mmsc="http://mmsc.ktfwing.com:9082"
       port="80"
@@ -25302,6 +25386,13 @@
       type="default,supl"
   />
 
+  <apn carrier="中国移动 (China Mobile) GPRS"
+      mcc="460"
+      mnc="08"
+      apn="cmnet"
+      type="default,supl"
+  />
+
   <apn carrier="中国移动 (China Mobile) WAP"
       mcc="460"
       mnc="07"
@@ -25323,6 +25414,27 @@
       type="mms"
   />
 
+  <apn carrier="中国移动 (China Mobile) WAP"
+      mcc="460"
+      mnc="08"
+      apn="cmwap"
+      proxy="10.0.0.172"
+      port="80"
+      type="default,supl"
+  />
+
+  <apn carrier="中国移动彩信 (China Mobile)"
+      mcc="460"
+      mnc="08"
+      apn="cmwap"
+      proxy="10.0.0.172"
+      port="80"
+      mmsc="http://mmsc.monternet.com"
+      mmsproxy="10.0.0.172"
+      mmsport="80"
+      type="mms"
+  />
+
   <apn carrier="China Unicom 3G"
       apn="3gnet"
       mcc="460"
@@ -25341,6 +25453,93 @@
       mmsc="http://mmsc.myuni.com.cn"
       type="default, mms"/>
 
+  <apn carrier="ctlte"
+      mcc="460"
+      mnc="11"
+      apn="ctlte"
+      user=""
+      password=""
+      authtype="0"
+      server="*"
+      proxy=""
+      port="80"
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="default,hipri,supl,fota,cbs"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="CTWAP"
+      mcc="460"
+      mnc="11"
+      apn="ctwap"
+      user=""
+      password=""
+      authtype="0"
+      server="*"
+      proxy=""
+      port="80"
+      mmsc="http://mmsc.vnet.mobi"
+      mmsproxy="10.0.0.200"
+      mmsport="80"
+      type="mms"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="CTNET"
+      mcc="460"
+      mnc="03"
+      apn="ctnet"
+      user="ctnet@mycdma.cn"
+      password="vnet.mobi"
+      authtype="3"
+      server="*"
+      proxy=""
+      port="80"
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="default,hipri,fota,cbs"
+      protocol="IP"
+  />
+
+  <apn carrier="CTWAP"
+      mcc="460"
+      mnc="03"
+      apn="ctwap"
+      user="ctwap@mycdma.cn"
+      password="vnet.mobi"
+      authtype="3"
+      server="*"
+      proxy=""
+      port="80"
+      mmsc="http://mmsc.vnet.mobi"
+      mmsproxy="10.0.0.200"
+      mmsport="80"
+      type="default,mms,hipri,supl,fota,cbs"
+      protocol="IP"
+  />
+
+  <apn carrier="CTNET"
+      mcc="204"
+      mnc="04"
+      apn="ctnet"
+      user=""
+      password=""
+      authtype="0"
+      server="*"
+      proxy=""
+      port=""
+      mmsc=""
+      mmsproxy=""
+      mmsport=""
+      type="default,hipri,supl,fota,cbs"
+      mvno_type="spn"
+      mvno_match_data="中国电信"
+      protocol="IP"
+  />
+
   <apn carrier="遠傳電信(Far EasTone) (MMS)"
       mcc="466"
       mnc="01"
@@ -25713,20 +25912,6 @@
       type="default,supl"
   />
 
-  <apn carrier="Optus Business Mobile Broadband"
-      mcc="505"
-      mnc="02"
-      apn="yesbusiness"
-      type="default,supl"
-  />
-
-  <apn carrier="Optus Internet"
-      mcc="505"
-      mnc="02"
-      apn="internet"
-      type="default"
-  />
-
   <apn carrier="Optus MMS"
       mcc="505"
       mnc="02"
@@ -25749,10 +25934,8 @@
   <apn carrier="Virgin Internet"
       mcc="505"
       mnc="02"
-      apn="virgininternet"
-      type="default"
-      proxy="202.139.83.152"
-      port="8070"
+      apn="yesinternet"
+      type="default,supl"
       mvno_match_data="505029"
       mvno_type="imsi"
   />
@@ -25760,11 +25943,11 @@
   <apn carrier="Virgin MMS"
       mcc="505"
       mnc="02"
-      apn="virginmms"
-      type="mms"
-      mmsc="http://mms.virginvibe.com.au:8002"
-      mmsproxy="202.139.83.152"
+      apn="mms"
+      mmsc="http://mmsc.optus.com.au:8002/"
+      mmsproxy="61.88.190.10"
       mmsport="8070"
+      type="mms"
       mvno_match_data="505029"
       mvno_type="imsi"
   />
@@ -25984,7 +26167,7 @@
       authtype="1"
   />
 
-  <apn carrier="TSEL-SNS"
+  <apn carrier="internet"
       mcc="510"
       mnc="10"
       apn="internet"
@@ -26085,8 +26268,6 @@
       user="3gprs"
       password="3gprs"
       authtype="1"
-      proxy="10.4.0.10"
-      port="3128"
       type="default,supl"
   />
 
@@ -26471,18 +26652,6 @@
       type="default,supl"
   />
 
-  <apn carrier="M1 WAP"
-      mcc="525"
-      mnc="03"
-      apn="miworld"
-      user="65"
-      password="user123"
-      proxy="172.16.1.23"
-      port="8081"
-      authtype="1"
-      type="default,supl"
-  />
-
   <apn carrier="M1 MMS(3G)"
       mcc="525"
       mnc="03"
@@ -26503,18 +26672,6 @@
       type="default,supl"
   />
 
-  <apn carrier="M1 WAP"
-      mcc="525"
-      mnc="04"
-      apn="miworld"
-      user="65"
-      password="user123"
-      authtype="1"
-      proxy="172.16.1.23"
-      port="8081"
-      type="default,supl"
-  />
-
   <apn carrier="M1 MMS(3G)"
       mcc="525"
       mnc="04"
@@ -26576,32 +26733,73 @@
       type="default,supl"
   />
 
-  <apn carrier="TelecomData"
+  <apn carrier="Data"
       mcc="530"
       mnc="05"
-      apn="wap.telecom.co.nz"
+      apn="Internet"
       type="default,supl"
   />
 
-  <apn carrier="TelecomContent"
+  <apn carrier="Content"
       mcc="530"
       mnc="05"
-      apn="wap.telecom.co.nz"
+      apn="Internet"
       proxy="210.55.11.73"
       port="80"
       type="default,supl"
   />
 
-  <apn carrier="TelecomMMS"
+  <apn carrier="MMS"
       mcc="530"
       mnc="05"
-      apn="wap.telecom.co.nz"
+      apn="Internet"
       mmsc="http://lsmmsc.xtra.co.nz"
       mmsproxy="210.55.11.73"
       mmsport="80"
       type="mms"
   />
 
+  <apn carrier="Default"
+      mcc="530"
+      mnc="05"
+      apn="wapaccess.co.nz"
+      type="default,supl"
+      mvno_match_data="53005204"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Content"
+      mcc="530"
+      mnc="05"
+      apn="wapaccess.co.nz"
+      proxy="210.55.11.73"
+      port="80"
+      type="default,supl"
+      mvno_match_data="53005204"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Data"
+      mcc="530"
+      mnc="05"
+      apn="wapaccess.co.nz"
+      type="default,supl"
+      mvno_match_data="53005204"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="MMS"
+      mcc="530"
+      mnc="05"
+      apn="wapaccess.co.nz"
+      mmsc="http://mms.mmsaccess.co.nz"
+      mmsproxy="210.55.11.73"
+      mmsport="80"
+      type="mms"
+      mvno_match_data="53005204"
+      mvno_type="imsi"
+  />
+
   <apn carrier="2Degrees Internet"
       mcc="530"
       mnc="24"