Merge "Put APNs in order" am: b9dc91b7b1

Original change: https://android-review.googlesource.com/c/device/sample/+/1562973

Change-Id: I691b3906be07f33c829a2cb38aba6adc1c13974c

1 files changed, 522 insertions, 521 deletions

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 4d4b140..2524f13 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -603,6 +603,49 @@
       protocol="IPV4V6"
   />
 
+  <apn carrier="HOT mobile Internet"
+      carrier_id = "1991"
+      mcc="204"
+      mnc="04"
+      apn="net.hotm"
+      type="default,supl"
+      mvno_match_data="HOT mobile"
+      mvno_type="spn"
+  />
+
+  <apn carrier="HOT mobile MMS"
+      carrier_id = "1991"
+      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="CTNET"
+      carrier_id = "2237"
+      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="KPN/Hi 4G LTE Mobiel internet"
       carrier_id = "1644"
       mcc="204"
@@ -683,27 +726,15 @@
       mvno_match_data="54727555533030656E"
   />
 
-  <apn carrier="HOT mobile Internet"
-      carrier_id = "1991"
-      mcc="204"
-      mnc="04"
-      apn="net.hotm"
-      type="default,supl"
-      mvno_match_data="HOT mobile"
-      mvno_type="spn"
-  />
-
-  <apn carrier="HOT mobile MMS"
-      carrier_id = "1991"
+  <apn carrier="Lycamobile"
       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"
+      mnc="09"
+      apn="data.lycamobile.nl"
+      authtype="1"
+      user=""
+      password=""
       mvno_type="spn"
+      mvno_match_data="Lycamobile"
   />
 
   <apn carrier="Telfort Internet"
@@ -926,6 +957,17 @@
       type="mms"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="206"
+      mnc="06"
+      apn="data.lycamobile.be"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Mobistar MMS"
       carrier_id = "1366"
       mcc="206"
@@ -1011,6 +1053,14 @@
       type="default,supl"
   />
 
+  <apn carrier="Unleashed"
+      carrier_id = "2144"
+      mcc="206"
+      mnc="30"
+      apn="web.be"
+      type="default,supl"
+  />
+
   <apn carrier="Orange World"
       carrier_id = "32"
       mcc="208"
@@ -1651,6 +1701,17 @@
       type="mms"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="208"
+      mnc="25"
+      apn="data.lycamobile.fr"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="NRJ WEB"
       carrier_id = "2005"
       mcc="208"
@@ -1689,6 +1750,13 @@
       type="mms"
   />
 
+  <apn carrier="Mobiland"
+      carrier_id = "450"
+      mcc="213"
+      mnc="03"
+      apn="internet"
+      type="default,supl"
+  />
 
   <apn carrier="Internet móvil"
       mcc="214"
@@ -2216,14 +2284,6 @@
       mvno_match_data="pepephone"
   />
 
-  <apn carrier="Mobiland"
-      carrier_id = "450"
-      mcc="213"
-      mnc="03"
-      apn="internet"
-      type="default,supl"
-  />
-
   <apn carrier="Movistar"
       carrier_id = "34"
       mcc="214"
@@ -2429,6 +2489,17 @@
       type="default,supl"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="214"
+      mnc="25"
+      apn="data.lycamobile.es"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Truphone"
       carrier_id = "2143"
       mcc="214"
@@ -3125,6 +3196,23 @@
       mvno_match_data="GigSky"
   />
 
+  <apn carrier="Kena Mobile Web"
+      mcc="222"
+      mnc="07"
+      apn="web.kenamobile.it"
+      type="default"
+  />
+
+  <apn carrier="Kena Mobile MMS"
+      mcc="222"
+      mnc="07"
+      apn="mms.kenamobile.it"
+      type="mms"
+      mmsc="http://mms.kenamobile.it"
+      mmsproxy="10.248.1.12"
+      mmsport="80"
+  />
+
   <apn carrier="Acc. Internet da cell"
       mcc="222"
       mnc="10"
@@ -3246,6 +3334,17 @@
       mvno_match_data="Daily Telecom"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="222"
+      mnc="35"
+      apn="data.lycamobile.it"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="DIGI Italy"
       carrier_id="2443"
       mcc="222"
@@ -3554,6 +3653,17 @@
       type="default"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="226"
+      mnc="16"
+      apn="data.lycamobile.ro"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Swisscom MMS"
       carrier_id = "2366"
       mcc="228"
@@ -3637,6 +3747,17 @@
       mvno_type="gid"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="228"
+      mnc="54"
+      apn="data.lycamobile.ch"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="T-Mobile CZ"
       carrier_id = "2394"
       mcc="230"
@@ -3885,6 +4006,18 @@
       type="default,supl"
   />
 
+  <apn carrier="Lycamobile"
+      carrier_id = "2404"
+      mcc="232"
+      mnc="08"
+      apn="data.lycamobile.at"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Planet3"
       carrier_id = "1344"
       mcc="232"
@@ -4668,6 +4801,24 @@
       type="mms"
   />
 
+  <apn carrier="Internet"
+      mcc="234"
+      mnc="57"
+      apn="mobile.sky"
+      authtype="0"
+      type="default,supl"
+  />
+
+  <apn carrier="MMS"
+      mcc="234"
+      mnc="57"
+      apn="mms.mobile.sky"
+      mmsc="http://185.110.178.96:38090/was"
+      mmsproxy="185.110.178.97"
+      mmsport="9028"
+      type="mms"
+  />
+
   <apn carrier="3G HSDPA"
       carrier_id = "1507"
       mcc="234"
@@ -4877,6 +5028,17 @@
       roaming_protocol="IP"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="238"
+      mnc="12"
+      apn="data.lycamobile.dk"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Telia SurfPort"
       carrier_id = "656"
       mcc="238"
@@ -5289,6 +5451,18 @@
       type="mms"
   />
 
+  <apn carrier="Lycamobile"
+      carrier_id = "2405"
+      mcc="240"
+      mnc="12"
+      apn="data.lycamobile.se"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Halebop Internet"
       mcc="240"
       mnc="017"
@@ -5466,6 +5640,17 @@
       type="default,supl"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="242"
+      mnc="23"
+      apn="data.lyca-mobile.no"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="DNA Internet"
       carrier_id = "1904"
       mcc="244"
@@ -6268,6 +6453,44 @@
       type="default,supl"
   />
 
+  <apn carrier="Sberbank-Telecom Internet"
+      carrier_id = "2251"
+      mcc="250"
+      mnc="50"
+      apn="internet.sberbank-tele.com"
+      user=""
+      password=""
+      type="default,supl"
+      mvno_type="gid"
+      mvno_match_data="FA3207"
+  />
+
+  <apn carrier="Sberbank-Telecom MMS"
+      carrier_id = "2251"
+      mcc="250"
+      mnc="50"
+      apn="mms.sberbank-tele.com"
+      user=""
+      password=""
+      mmsc="http://mmsc"
+      mmsproxy="10.77.36.100"
+      mmsport="8080"
+      type="mms"
+      mvno_type="gid"
+      mvno_match_data="FA3207"
+  />
+
+  <apn carrier="Sberbank-Telecom IMS"
+      carrier_id = "2251"
+      mcc="250"
+      mnc="50"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="FA3207"
+  />
+
   <apn carrier="Tinkoff Mobile"
       carrier_id = "2142"
       mcc="250"
@@ -6676,6 +6899,18 @@
       type="mms"
   />
 
+  <apn carrier="Lycamobile"
+      carrier_id = "2403"
+      mcc="260"
+      mnc="09"
+      apn="data.lycamobile.pl"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Truphone"
       carrier_id = "2143"
       mcc="260"
@@ -6937,6 +7172,17 @@
       type="default,supl,mms,dun"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="262"
+      mnc="43"
+      apn="data.lycamobile.de"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Vodafone Net2"
       mcc="268"
       mnc="01"
@@ -6992,6 +7238,17 @@
       type="dun"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="268"
+      mnc="04"
+      apn="data.lycamobile.pt"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="tmn internet"
       carrier_id = "1670"
       mcc="268"
@@ -7213,6 +7470,17 @@
       mvno_type="gid"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="272"
+      mnc="13"
+      apn="data.lycamobile.ie"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Siminn Internet"
       carrier_id = "1565"
       mcc="274"
@@ -7355,6 +7623,27 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Orange Armenia MMS"
+      carrier_id = "1940"
+      mcc="283"
+      mnc="10"
+      apn="mms"
+      mmsc="http://mms/"
+      mmsproxy="192.168.220.251"
+      mmsport="3128"
+      type="mms"
+      authtype="1"
+  />
+
+  <apn carrier="Orange Armenia Internet"
+      carrier_id = "1940"
+      mcc="283"
+      mnc="10"
+      apn="Internet"
+      type="default"
+      authtype="1"
+  />
+
   <apn carrier="MTel"
       carrier_id = "1370"
       mcc="284"
@@ -7694,6 +7983,17 @@
       type="mms"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="294"
+      mnc="04"
+      apn="data.lycamobile.mk"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="EMnify"
       carrier_id = "2326"
       mcc="295"
@@ -15769,6 +16069,17 @@
       protocol="IPV4V6"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="311"
+      mnc="960"
+      apn="data.lycamobile.com"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="custer"
       carrier_id = "2162"
       mcc="312"
@@ -16957,15 +17268,6 @@
       type="mms"
   />
 
-  <apn carrier="Lime Internet Postpaid"
-      mcc="360"
-      mnc="11"
-      apn="internet"
-      user=""
-      password=""
-      type="default,supl"
-  />
-
   <apn carrier='St Lucia:Lime:Internet'
       carrier_id = "2293"
       mcc='358'
@@ -16998,6 +17300,15 @@
       type='dun'
   />
 
+  <apn carrier="Lime Internet Postpaid"
+      mcc="360"
+      mnc="11"
+      apn="internet"
+      user=""
+      password=""
+      type="default,supl"
+  />
+
   <apn carrier="Lime Postpaid MMS"
       mcc="360"
       mnc="11"
@@ -27657,6 +27968,42 @@
       type="mms"
   />
 
+  <apn carrier="CTNET"
+      carrier_id = "2237"
+      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"
+      carrier_id = "2237"
+      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="中国移动 (China Mobile) GPRS"
       carrier_id = "1435"
       mcc="460"
@@ -27775,62 +28122,6 @@
       protocol="IPV4V6"
   />
 
-  <apn carrier="CTNET"
-      carrier_id = "2237"
-      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"
-      carrier_id = "2237"
-      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"
-      carrier_id = "2237"
-      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)"
       carrier_id = "1881"
       mcc="466"
@@ -28352,6 +28643,17 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="505"
+      mnc="19"
+      apn="data.lycamobile.com.au"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Truphone"
       carrier_id = "2143"
       mcc="505"
@@ -30750,6 +31052,21 @@
       type="default,supl"
   />
 
+  <apn carrier="Orange CM"
+      carrier_id = "1434"
+      mcc="624"
+      mnc="02"
+      apn="orangecmgprs"
+      user="orange"
+      password="orange"
+      proxy="192.168.122.101"
+      port="8080"
+      mmsc="http://mms.orange.cm"
+      mmsproxy="192.168.122.101"
+      mmsport="8080"
+      type="default,mms"
+  />
+
   <apn carrier="CVMOVEL"
       carrier_id = "1445"
       mcc="625"
@@ -31203,6 +31520,14 @@
       type="default,supl"
   />
 
+  <apn carrier="Orange net KE"
+      carrier_id = "2210"
+      mcc="639"
+      mnc="07"
+      apn="bew.orange.co.ke"
+      type="default"
+  />
+
   <apn carrier="Orange MMS"
       carrier_id = "2210"
       mcc="639"
@@ -31291,6 +31616,17 @@
       type="default"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="641"
+      mnc="26"
+      apn="data.lycamobile.ug"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Spacetel"
       carrier_id = "1373"
       mcc="642"
@@ -31396,6 +31732,31 @@
       authtype="0"
   />
 
+  <apn carrier="Orange World MG"
+      carrier_id = "1606"
+      mcc="646"
+      mnc="02"
+      apn="orangeworld"
+      user="world"
+      password="orange"
+      proxy="10.150.0.115"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="Orange MG MMS"
+      carrier_id = "1606"
+      mcc="646"
+      mnc="02"
+      apn="orangemms"
+      user="mms"
+      password="orange"
+      mmsc="http://10.152.10.70.38090"
+      mmsproxy="10.150.0.115"
+      mmsport="8080"
+      type="mms"
+  />
+
   <apn carrier="Orange World re"
       carrier_id = "1676"
       mcc="647"
@@ -31406,6 +31767,16 @@
       type="default,supl"
   />
 
+  <apn carrier="Orange RE"
+      carrier_id = "1676"
+      mcc="647"
+      mnc="00"
+      apn="orangerun"
+      user="orange"
+      password="orange"
+      type="default"
+  />
+
   <apn carrier="Orange MMS Réunion"
       carrier_id = "1676"
       mcc="647"
@@ -31586,6 +31957,27 @@
       type="mms"
   />
 
+  <apn carrier="Orange BW MMS"
+      carrier_id = "567"
+      mcc="652"
+      mnc="02"
+      apn="mms.orange.co.bw"
+      mmsc="http://10.0.0.242/servlets/mms"
+      mmsproxy="10.0.0.226"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Orange WAP BW"
+      carrier_id = "567"
+      mcc="652"
+      mnc="02"
+      apn="internet.orange.co.bw"
+      proxy="10.0.0.226"
+      port="8080"
+      type="default"
+  />
+
   <apn carrier="Swazi MTN"
       carrier_id = "1091"
       mcc="653"
@@ -31755,6 +32147,17 @@
       type="mms"
   />
 
+  <apn carrier="Lycamobile"
+      mcc="655"
+      mnc="53"
+      apn="data.lycamobile.co.za"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Lycamobile"
+  />
+
   <apn carrier="Eritel"
       carrier_id = "2247"
       mcc="657"
@@ -33373,6 +33776,33 @@
       type='mms'
   />
 
+  <apn carrier="Internet WOM"
+    carrier_id="1430"
+    mcc="730"
+    mnc="09"
+    apn="internet"
+    type="default"
+    user=""
+    password=""
+    protocol="IPV4V6"
+    roaming_protocol="IPV4V6"
+    user_editable="false"
+  />
+
+  <apn carrier="IMS"
+    carrier_id="1430"
+    mcc="730"
+    mnc="09"
+    apn="ims"
+    type="ims"
+    user=""
+    password=""
+    protocol="IPV4"
+    roaming_protocol="IPV4"
+    user_editable="false"
+    user_visible="false"
+  />
+
   <apn carrier="Internet Movil"
       carrier_id = "1427"
       mcc="730"
@@ -34345,106 +34775,6 @@
       type="mms"
   />
 
-  <apn carrier="Orange Armenia MMS"
-      carrier_id = "1940"
-      mcc="283"
-      mnc="10"
-      apn="mms"
-      mmsc="http://mms/"
-      mmsproxy="192.168.220.251"
-      mmsport="3128"
-      type="mms"
-      authtype="1"
-  />
-
-  <apn carrier="Orange Armenia Internet"
-      carrier_id = "1940"
-      mcc="283"
-      mnc="10"
-      apn="Internet"
-      type="default"
-      authtype="1"
-  />
-
-  <apn carrier="Orange BW MMS"
-      carrier_id = "567"
-      mcc="652"
-      mnc="02"
-      apn="mms.orange.co.bw"
-      mmsc="http://10.0.0.242/servlets/mms"
-      mmsproxy="10.0.0.226"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="Orange WAP BW"
-      carrier_id = "567"
-      mcc="652"
-      mnc="02"
-      apn="internet.orange.co.bw"
-      proxy="10.0.0.226"
-      port="8080"
-      type="default"
-  />
-
-  <apn carrier="Orange CM"
-      carrier_id = "1434"
-      mcc="624"
-      mnc="02"
-      apn="orangecmgprs"
-      user="orange"
-      password="orange"
-      proxy="192.168.122.101"
-      port="8080"
-      mmsc="http://mms.orange.cm"
-      mmsproxy="192.168.122.101"
-      mmsport="8080"
-      type="default,mms"
-  />
-
-  <apn carrier="Orange net KE"
-      carrier_id = "2210"
-      mcc="639"
-      mnc="07"
-      apn="bew.orange.co.ke"
-      type="default"
-  />
-
-  <apn carrier="Orange RE"
-      carrier_id = "1676"
-      mcc="647"
-      mnc="00"
-      apn="orangerun"
-      user="orange"
-      password="orange"
-      type="default"
-  />
-
-  <apn carrier="Orange MG MMS"
-      carrier_id = "1606"
-      mcc="646"
-      mnc="02"
-      apn="orangemms"
-      user="mms"
-      password="orange"
-      mmsc="http://10.152.10.70.38090"
-      mmsproxy="10.150.0.115"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="Orange World MG"
-      carrier_id = "1606"
-      mcc="646"
-      mnc="02"
-      apn="orangeworld"
-      user="world"
-      password="orange"
-      proxy="10.150.0.115"
-      port="8080"
-      type="default"
-  />
-
   <apn carrier="CIOT Vodafone"
       mcc="901"
       mnc="28"
@@ -34476,308 +34806,6 @@
       type="default,supl"
   />
 
-  <apn carrier="Sberbank-Telecom Internet"
-      carrier_id = "2251"
-      mcc="250"
-      mnc="50"
-      apn="internet.sberbank-tele.com"
-      user=""
-      password=""
-      type="default,supl"
-      mvno_type="gid"
-      mvno_match_data="FA3207"
-  />
-  <apn carrier="Sberbank-Telecom MMS"
-      carrier_id = "2251"
-      mcc="250"
-      mnc="50"
-      apn="mms.sberbank-tele.com"
-      user=""
-      password=""
-      mmsc="http://mmsc"
-      mmsproxy="10.77.36.100"
-      mmsport="8080"
-      type="mms"
-      mvno_type="gid"
-      mvno_match_data="FA3207"
-  />
-  <apn carrier="Sberbank-Telecom IMS"
-      carrier_id = "2251"
-      mcc="250"
-      mnc="50"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      mvno_type="gid"
-      mvno_match_data="FA3207"
-  />
-
-  <apn carrier="Unleashed"
-      carrier_id = "2144"
-      mcc="206"
-      mnc="30"
-      apn="web.be"
-      type="default,supl"
-  />
-
-  <apn carrier="Kena Mobile Web"
-      mcc="222"
-      mnc="07"
-      apn="web.kenamobile.it"
-      type="default"
-  />
-
-  <apn carrier="Kena Mobile MMS"
-      mcc="222"
-      mnc="07"
-      apn="mms.kenamobile.it"
-      type="mms"
-      mmsc="http://mms.kenamobile.it"
-      mmsproxy="10.248.1.12"
-      mmsport="80"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="505"
-      mnc="19"
-      apn="data.lycamobile.com.au"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="242"
-      mnc="23"
-      apn="data.lyca-mobile.no"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="228"
-      mnc="54"
-      apn="data.lycamobile.ch"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      carrier_id = "2404"
-      mcc="232"
-      mnc="08"
-      apn="data.lycamobile.at"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="206"
-      mnc="06"
-      apn="data.lycamobile.be"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="262"
-      mnc="43"
-      apn="data.lycamobile.de"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="238"
-      mnc="12"
-      apn="data.lycamobile.dk"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="214"
-      mnc="25"
-      apn="data.lycamobile.es"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="208"
-      mnc="25"
-      apn="data.lycamobile.fr"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="272"
-      mnc="13"
-      apn="data.lycamobile.ie"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="204"
-      mnc="09"
-      apn="data.lycamobile.nl"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      carrier_id = "2403"
-      mcc="260"
-      mnc="09"
-      apn="data.lycamobile.pl"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="268"
-      mnc="04"
-      apn="data.lycamobile.pt"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="226"
-      mnc="16"
-      apn="data.lycamobile.ro"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      carrier_id = "2405"
-      mcc="240"
-      mnc="12"
-      apn="data.lycamobile.se"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="222"
-      mnc="35"
-      apn="data.lycamobile.it"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="311"
-      mnc="960"
-      apn="data.lycamobile.com"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="641"
-      mnc="26"
-      apn="data.lycamobile.ug"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="294"
-      mnc="04"
-      apn="data.lycamobile.mk"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Lycamobile"
-      mcc="655"
-      mnc="53"
-      apn="data.lycamobile.co.za"
-      authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-  />
-
-  <apn carrier="Internet"
-      mcc="234"
-      mnc="57"
-      apn="mobile.sky"
-      authtype="0"
-      type="default,supl"
-  />
-
-  <apn carrier="MMS"
-      mcc="234"
-      mnc="57"
-      apn="mms.mobile.sky"
-      mmsc="http://185.110.178.96:38090/was"
-      mmsproxy="185.110.178.97"
-      mmsport="9028"
-      type="mms"
-  />
-
   <apn carrier="Altan"
       carrier_id = "2469"
       mcc="334"
@@ -34840,33 +34868,6 @@
       type="default,supl"
   />
 
-  <apn carrier="Internet WOM"
-    carrier_id="1430"
-    mcc="730"
-    mnc="09"
-    apn="internet"
-    type="default"
-    user=""
-    password=""
-    protocol="IPV4V6"
-    roaming_protocol="IPV4V6"
-    user_editable="false"
-  />
-
-  <apn carrier="IMS"
-    carrier_id="1430"
-    mcc="730"
-    mnc="09"
-    apn="ims"
-    type="ims"
-    user=""
-    password=""
-    protocol="IPV4"
-    roaming_protocol="IPV4"
-    user_editable="false"
-    user_visible="false"
-  />
-
   <apn carrier="Megacable"
     carrier_id="2473"
     mcc="334"