mako: Update apns from operator's requests

Updated Profile:
- Canada Eastlink(dual imsi) 206-01: add new profile
- Canada Wind(dual imsi) 222-01: add new profile
- Canada Wind(dual imsi) 222-88: add new profile
- Canada TELUS 302-220: add mvno type
- Canada Koodo 302-220: add mvno type
- Canada PC mobile 302-220: add mvno type
- Canada TELUS 302-221: add new profile
- Canada Koodo 302-221: add new profile
- Canada PC mobile 302-221: add new profile
- Canada Fido 302-370: update mmsproxy
- Canada WIND Mobile 302-490: update protocol
- Canada Videotron 302-510: add new profile
- Canada Bell 302-610: remove mmsproxy
- Canada MTS 302-660: add mvno type, update mmsproxy,mmsport,protocol
- Canada MTS 302-370: add mvno type, update mmsproxy,mmsport,protocol
- Canada Rogers 302-720: update mmsproxy
- Canada Rogers 302-720: update profile
- Canada SaskTel 302-780: update mmsc
- US T-Mobile: update apn name, protocol, roaming protocol
  (301- 160,200,210,220,230,240,250,260,270,310,490,580,660,800,880)
- Estonia Tele2 248-03: update profile for prepaid and postpaid
- Spain Jazztel 214-21: updata mmsc

b/10293040 - [HH][Canada/Rogers] Request to show designated APN
             according to SIM card or kind of device(UMTS / LTE APN)
b/11440251 - [France SFR] MMS do not work due to wrong APN
Change-Id: Ib33956e640395cf426308370fc6d6aa331d1dad9
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 9cad066..4c39605 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -211,6 +211,27 @@
        mvno_type="imsi"
   />
 
+  <apn carrier="MMS"
+      mcc="206"
+      mnc="01"
+      apn="mms.mobi.eastlink.ca"
+      mmsc="http://mmss.mobi.eastlink.ca"
+      mmsproxy="10.232.12.49"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="B6"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Internet"
+      mcc="206"
+      mnc="01"
+      apn="wisp.mobi.eastlink.ca"
+      type="default,supl,dun"
+      mvno_match_data="B6"
+      mvno_type="gid"
+  />
+
   <apn carrier="Telenet"
       mcc="206"
       mnc="05"
@@ -882,7 +903,7 @@
       apn="jazzmms"
       user=""
       password=""
-      mmsc="http://jazztelmms.com/servlets/mms/"
+      mmsc="http://jazztelmms.com/servlets/mms"
       mmsproxy="37.132.0.10"
       mmsport="8080"
       authtype="1"
@@ -964,7 +985,7 @@
       user=""
       password=""
       authtype="1"
-      mmsc="http://jazztelmms.com/servlets/mms/"
+      mmsc="http://jazztelmms.com/servlets/mms"
       mmsproxy="37.132.0.10"
       mmsport="8080"
       type="mms"
@@ -1281,6 +1302,27 @@
       type="mms"
   />
 
+  <apn carrier="Internet"
+      mcc="222"
+      mnc="01"
+      apn="internet.windmobile.ca"
+      type="default,supl"
+      protocol="IPV4V6"
+      mvno_match_data="FFFFFF00"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MMS"
+      mcc="222"
+      mnc="01"
+      apn="mms.windmobile.ca"
+      mmsc="http://mms.windmobile.ca"
+      mmsproxy="74.115.197.70"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="FFFFFF00"
+      mvno_type="gid"
+  />
   <apn carrier="MMS Vodafone"
       mcc="222"
       mnc="10"
@@ -1322,6 +1364,28 @@
       type="mms"
   />
 
+  <apn carrier="Internet"
+      mcc="222"
+      mnc="88"
+      apn="internet.windmobile.ca"
+      type="default,supl"
+      protocol="IPV4V6"
+      mvno_match_data="FFFFFF00"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MMS"
+      mcc="222"
+      mnc="88"
+      apn="mms.windmobile.ca"
+      mmsc="http://mms.windmobile.ca"
+      mmsproxy="74.115.197.70"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="FFFFFF00"
+      mvno_type="gid"
+  />
+
   <apn carrier="3"
       mcc="222"
       mnc="99"
@@ -2845,6 +2909,8 @@
       mnc="03"
       apn="internet.tele2.ee"
       type="default,supl"
+      mvno_match_data="24803005x"
+      mvno_type="imsi"
   />
 
   <apn carrier="Tele2 MMS"
@@ -2855,6 +2921,41 @@
       mmsproxy="193.12.40.6"
       mmsport="8080"
       type="mms"
+      mvno_match_data="24803005x"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Smart/Ultra MMS"
+      mcc="248"
+      mnc="03"
+      apn="internet.tele2.ee"
+      mmsc="http://mmsc.tele2.ee"
+      mmsproxy="193.12.40.6"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="24803005x"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Tele2 Internet"
+      mcc="248"
+      mnc="03"
+      apn="internet.tele2.ee"
+      type="default,supl"
+      mvno_match_data="24803000x"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Smart/Ultra MMS"
+      mcc="248"
+      mnc="03"
+      apn="internet.tele2.ee"
+      mmsc="http://mmsc.tele2.ee"
+      mmsproxy="193.12.40.6"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="24803000x"
+      mvno_type="imsi"
   />
 
   <apn carrier="MTS Internet"
@@ -3815,32 +3916,73 @@
       mcc="302"
       mnc="220"
       apn="sp.telus.com"
+      type="default,mms,supl"
       mmsc="http://aliasredirect.net/proxy/mmsc"
       mmsproxy="74.49.0.18"
       mmsport="80"
-      type="default,supl,mms"
+      mvno_match_data="54"
+      mvno_type="gid"
   />
 
   <apn carrier="Koodo"
       mcc="302"
       mnc="220"
       apn="sp.koodo.com"
+      type="default,mms,supl,dun"
       mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
       mmsproxy="74.49.0.18"
       mmsport="80"
-      type="default,supl,mms"
+      mvno_match_data="4B"
+      mvno_type="gid"
   />
 
-  <apn carrier="PC Mobile"
+  <apn carrier="PC mobile"
       mcc="302"
       mnc="220"
       apn="sp.mb.com"
+      type="default,mms,supl"
       mmsc="http://aliasredirect.net/proxy/mb/mmsc"
       mmsproxy="74.49.0.18"
       mmsport="80"
-      type="default,supl,mms"
+      mvno_match_data="50"
+      mvno_type="gid"
   />
 
+  <apn carrier="TELUS"
+      mcc="302"
+      mnc="221"
+      apn="sp.telus.com"
+      type="default,mms,supl"
+      mmsc="http://aliasredirect.net/proxy/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="54"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Koodo"
+      mcc="302"
+      mnc="221"
+      apn="sp.koodo.com"
+      type="default,mms,supl,dun"
+      mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="4B"
+      mvno_type="gid"
+  />
+
+  <apn carrier="PC mobile"
+      mcc="302"
+      mnc="221"
+      apn="sp.mb.com"
+      type="default,mms,supl"
+      mmsc="http://aliasredirect.net/proxy/mb/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="50"
+      mvno_type="gid"
+  />
   <apn carrier="MOWAP"
       mcc="302"
       mnc="320"
@@ -3882,7 +4024,7 @@
       mnc="370"
       apn="fido-core-appl1.apn"
       mmsc="http://mms.fido.ca"
-      mmsproxy="205.151.11.13"
+      mmsproxy="mmsproxy.fido.ca"
       mmsport="80"
       type="default,supl,mms"
   />
@@ -3892,6 +4034,7 @@
       mnc="490"
       apn="internet.windmobile.ca"
       type="default,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="MMS"
@@ -3912,34 +4055,48 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Bell Internet"
+  <apn carrier="Videotron"
+      mcc="302"
+      mnc="510"
+      apn="media.videotron"
+      mmsc="http://media.videotron.com"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Bell Mobility"
       mcc="302"
       mnc="610"
       apn="pda.bell.ca"
+      type="default,mms,dun,supl"
       mmsc="http://mms.bell.ca/mms/wapenc"
-      mmsproxy="web.wireless.bell.ca"
-      mmsport="80"
-      type="default,supl,mms"
   />
 
   <apn carrier="MTS"
       mcc="302"
       mnc="660"
       apn="sp.mts"
+      type="default,mms,supl"
       mmsc="http://mmsc2.mts.net/"
-      mmsproxy="209.4.229.90"
-      mmsport="9401"
-      type="default,supl,mms"
+      mmsproxy="wapgw1.mts.net"
+      mmsport="9201"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="2C"
+      mvno_type="gid"
   />
 
-  <apn carrier="MTS-Roaming"
+  <apn carrier="MTS"
       mcc="302"
       mnc="370"
       apn="sp.mts"
+      type="default,mms,supl"
       mmsc="http://mmsc2.mts.net/"
-      mmsproxy="209.4.229.90"
-      mmsport="9401"
-      type="default,supl,mms"
+      mmsproxy="wapgw1.mts.net"
+      mmsport="9201"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="2C"
+      mvno_type="gid"
   />
 
   <apn carrier="Rogers"
@@ -3947,29 +4104,23 @@
       mnc="720"
       apn="rogers-core-appl1.apn"
       mmsc="http://mms.gprs.rogers.com"
-      mmsproxy="10.128.1.69"
+      mmsproxy="mmsproxy.rogers.com"
       mmsport="80"
       type="default,supl,mms"
   />
 
-  <apn carrier="Chatr Internet"
+  <apn carrier="chatr"
       mcc="302"
       mnc="720"
       apn="chatrweb.apn"
+      type="default,mms,supl"
       mmsc="http://mms.chatrwireless.com"
       mmsproxy="205.151.11.11"
       mmsport="80"
-      type="default,mms"
-  />
-
-  <apn carrier="Chatr Internet"
-      mcc="302"
-      mnc="720"
-      apn="chatrweb.apn"
-      mmsc="http://mms.chatrwireless.com"
-      mmsproxy="205.151.11.11"
-      mmsport="80"
-      type="default,mms"
+      proxy="205.151.11.11"
+      port="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="302720x94"
       mvno_type="imsi"
   />
@@ -3978,7 +4129,7 @@
       mcc="302"
       mnc="780"
       apn="pda.stm.sk.ca"
-      mmsc="http://mms.sasktel.com"
+      mmsc="http://mms.sasktel.com/"
       mmsproxy="mig.sasktel.com"
       mmsport="80"
       type="default,supl,mms"
@@ -4071,9 +4222,11 @@
   <apn carrier="T-Mobile US 160"
       mcc="310"
       mnc="160"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="DataConnect"
@@ -4098,73 +4251,91 @@
   <apn carrier="T-Mobile US 200"
       mcc="310"
       mnc="200"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="T-Mobile US 210"
       mcc="310"
       mnc="210"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="T-Mobile US 220"
       mcc="310"
       mnc="220"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="T-Mobile US 230"
       mcc="310"
       mnc="230"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="T-Mobile US 240"
       mcc="310"
       mnc="240"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="T-Mobile US 250"
       mcc="310"
       mnc="250"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
-  <apn carrier="T-Mobile US"
+  <apn carrier="T-Mobile GPRS"
       mcc="310"
       mnc="260"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="T-Mobile US 270"
       mcc="310"
       mnc="270"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="T-Mobile US 310"
       mcc="310"
       mnc="310"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="Cingular 380 ATT"
@@ -4295,9 +4466,11 @@
   <apn carrier="T-Mobile US 490"
       mcc="310"
       mnc="490"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="GoodCall Picture Message"
@@ -4343,9 +4516,11 @@
   <apn carrier="T-Mobile US 580"
       mcc="310"
       mnc="580"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="CellularOne MMS"
@@ -4378,9 +4553,11 @@
   <apn carrier="T-Mobile US 660"
       mcc="310"
       mnc="660"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="WEB 2"
@@ -4413,9 +4590,11 @@
   <apn carrier="T-Mobile US 800"
       mcc="310"
       mnc="800"
-      apn="epc.tmobile.com"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
   <apn carrier="Internet"