am 11c279f5: Remove AT&T IMS APN for Carrier Validation

* commit '11c279f53735e87f1cf19372bca27c76eb2792f5':
  Remove AT&T IMS APN for Carrier Validation
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 21a10be..323f542 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"
@@ -1834,8 +1893,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"
@@ -1975,6 +2032,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"
   />
@@ -2184,14 +2248,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"
@@ -2200,25 +2261,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"
@@ -2605,6 +2668,7 @@
       mnc="10"
       apn=""
       type="ia"
+      protocol="IPV4V6"
   />
 
   <apn carrier="MMS Vodafone"
@@ -2633,6 +2697,14 @@
       type="dun"
   />
 
+  <apn carrier="IMS Vodafone"
+      mcc="222"
+      mnc="10"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
   <apn carrier="PosteMobile"
       mcc="222"
       mnc="10"
@@ -2954,6 +3026,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"
@@ -3116,10 +3197,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"
@@ -5777,6 +5858,7 @@
       mnc="01"
       apn=""
       type="ia"
+      protocol="IPV4V6"
   />
 
   <apn carrier="Telekom Internet"
@@ -5812,6 +5894,7 @@
       mnc="02"
       apn=""
       type="ia"
+      protocol="IPV4V6"
   />
 
   <apn carrier="Vodafone DE-MMS"
@@ -5831,6 +5914,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"
@@ -6324,22 +6415,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"
@@ -15167,20 +15259,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"
@@ -16400,6 +16479,13 @@
       type="mms"
   />
 
+  <apn carrier="ALTEL INTERNET"
+      mcc="401"
+      mnc="07"
+      apn="internet"
+      type="default,supl"
+  />
+
   <apn carrier="Tele2 Internet"
       mcc="401"
       mnc="77"
@@ -23693,19 +23779,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"
@@ -23835,7 +23913,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Alon Internet"
+  <apn carrier="YouPhone"
       mcc="425"
       mnc="14"
       apn="data.youphone.co.il"
@@ -24338,6 +24416,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"
@@ -24401,6 +24494,22 @@
       authtype="2"
   />
 
+  <apn carrier="SBM"
+      mcc="440"
+      mnc="20"
+      apn=""
+      type="ia"
+      protocol="IP"
+  />
+
+  <apn carrier="IMS"
+      mcc="440"
+      mnc="20"
+      apn="IMS"
+      type="ims"
+      protocol="IPV6"
+  />
+
   <apn carrier="SoftBank 3G"
       mcc="440"
       mnc="20"
@@ -24440,6 +24549,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"
@@ -24449,6 +24575,7 @@
       mmsproxy="smart.nate.com"
       mmsport="9093"
       server="*"
+      protocol="IPV4V6"
   />
 
   <apn carrier="SKT 3G INTERNET"
@@ -24482,14 +24609,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"
@@ -24521,11 +24640,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"
   />
@@ -24555,20 +24683,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"
@@ -25284,6 +25419,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"
@@ -25305,6 +25447,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"
@@ -25323,6 +25486,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"
@@ -25695,20 +25945,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"
@@ -25732,7 +25968,7 @@
       mcc="505"
       mnc="02"
       apn="yesinternet"
-      type="default"
+      type="default,supl"
       mvno_match_data="505029"
       mvno_type="imsi"
   />
@@ -25741,10 +25977,10 @@
       mcc="505"
       mnc="02"
       apn="mms"
-      type="mms"
       mmsc="http://mmsc.optus.com.au:8002/"
       mmsproxy="61.88.190.10"
       mmsport="8070"
+      type="mms"
       mvno_match_data="505029"
       mvno_type="imsi"
   />
@@ -25964,7 +26200,7 @@
       authtype="1"
   />
 
-  <apn carrier="TSEL-SNS"
+  <apn carrier="internet"
       mcc="510"
       mnc="10"
       apn="internet"
@@ -26065,8 +26301,6 @@
       user="3gprs"
       password="3gprs"
       authtype="1"
-      proxy="10.4.0.10"
-      port="3128"
       type="default,supl"
   />
 
@@ -26451,18 +26685,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"
@@ -26483,18 +26705,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"
@@ -26556,32 +26766,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"