Snap for 8512216 from 69df3effbe2d2f41b3b265a27a27efad93fc0fab to tm-frc-media-swcodec-release

Change-Id: I389eef95c13a3a6a120cf9f875d518febc900ecd

2 files changed, 777 insertions, 259 deletions

diff --git a/etc/add_missing_ia.py b/etc/add_missing_ia.py
index 1a872ad..ad39f3d 100755
--- a/etc/add_missing_ia.py
+++ b/etc/add_missing_ia.py
@@ -16,8 +16,13 @@
 # This script help add the missing "IA" APN type to the APN entry that support "default" APN type
 import re
 with open('apns-full-conf.xml', 'r') as ifile, open('new-apns-full-conf.xml', 'w') as ofile:
-    ofile.write(re.sub("(?!.*ia)default", "default,ia", ifile.read()))
-
+    RE_TYPE = re.compile(r"^\s*type")
+    RE_IA_DEFAULT = re.compile(r"(?!.*ia)default")
+    for line in ifile:
+        if re.match(RE_TYPE, line):
+            ofile.write(re.sub(RE_IA_DEFAULT, "default,ia", line))
+        else:
+            ofile.write(line)
 
 
 
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index f70fa1c..c9ae289 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -3555,7 +3555,7 @@
       mcc="222"
       mnc="01"
       apn="xcap.tim.it"
-      type="ut"
+      type="xcap"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       user_visible="false"
@@ -4202,8 +4202,6 @@
       mcc="228"
       mnc="01"
       apn="gprs.swisscom.ch"
-      proxy="192.168.210.1"
-      port="8080"
       type="default,ia,supl"
   />
 
@@ -4218,6 +4216,15 @@
       user_visible="false"
   />
 
+  <apn carrier="Swisscom Ut"
+      carrier_id = "2366"
+      mcc="228"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      user_visible="false"
+  />
+
   <apn carrier="Sunrise live"
       carrier_id = "1413"
       mcc="228"
@@ -4237,15 +4244,36 @@
       type="mms"
   />
 
-  <apn carrier="Orange Internet"
+  <apn carrier="Sunrise IMS"
+      carrier_id = "1413"
+      mcc="228"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Sunrise Ut"
+      carrier_id = "1413"
+      mcc="228"
+      mnc="02"
+      apn="xcap"
+      type="xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="Salt Internet"
       carrier_id = "1414"
       mcc="228"
       mnc="03"
       apn="internet"
+      authtype="1"
       type="default,ia,supl"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="Salt MMS"
       carrier_id = "1414"
       mcc="228"
       mnc="03"
@@ -4253,9 +4281,30 @@
       mmsc="http://192.168.151.3:8002"
       mmsproxy="192.168.151.2"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
+  <apn carrier="Salt IMS"
+      carrier_id = "1414"
+      mcc="228"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Salt Ut"
+      carrier_id = "1414"
+      mcc="228"
+      mnc="03"
+      apn="hos"
+      type="xcap"
+      user_visible="false"
+  />
+
   <apn carrier="netgprs.com"
       carrier_id = "2271"
       mcc="228"
@@ -4280,6 +4329,27 @@
       mvno_type="gid"
   />
 
+  <apn carrier="upcnet"
+      mcc="228"
+      mnc="53"
+      apn="Internet.ch.upcmobile.com"
+      type="default,ia,supl"
+      mvno_type="gid"
+      mvno_match_data="75636831"
+  />
+
+  <apn carrier="upcmms"
+      mcc="228"
+      mnc="53"
+      apn="mms.ch.upcmobile.com"
+      mmsc="http://mms.ch.upcmobile.com:8080/servlets/mms"
+      mmsproxy="62.179.127.18"
+      mmsport="8080"
+      type="mms"
+      mvno_type="gid"
+      mvno_match_data="75636831"
+  />
+
   <apn carrier="Lycamobile"
       mcc="228"
       mnc="54"
@@ -4338,14 +4408,28 @@
   />
 
   <apn carrier="HOS"
+      carrier_id = "2394"
       mcc="230"
       mnc="01"
       apn="hos"
-      type="xcap"
+      mmsc="http://mms"
+      mmsproxy="10.0.0.10"
+      mmsport="80"
+      authtype="1"
+      type="mms"
+      network_type_bitmask="18"
       protocol="IPV4V6"
       user_visible="false"
   />
 
+  <apn carrier="HOS"
+      mcc="230"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
 
   <apn carrier="O2 internet"
       carrier_id = "1449"
@@ -4353,6 +4437,9 @@
       mnc="02"
       apn="internet"
       type="default,ia,supl"
+      authtype="0"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="O2 MMS"
@@ -4366,12 +4453,32 @@
       type="mms"
   />
 
+  <apn carrier="O2 VoLTE Hlas"
+      carrier_id = "1449"
+      mcc="230"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="O2 VoLTE"
+      carrier_id = "1449"
+      mcc="230"
+      mnc="02"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
   <apn carrier="Internet"
       carrier_id = "2398"
       mcc="230"
       mnc="03"
       apn="internet"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
   />
 
   <apn carrier="MMS"
@@ -4386,17 +4493,35 @@
       mmsport="80"
       authtype="1"
       type="mms"
+      user_editable="false"
   />
 
-  <apn carrier="Orange SK"
+  <apn carrier="IMS"
+      carrier_id = "2398"
+      mcc="230"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      user_visible="false"
+  />
+
+  <apn carrier="Orange Internet"
       carrier_id = "1713"
       mcc="231"
       mnc="01"
       apn="internet"
-      type="default,ia"
+      type="default,ia,supl"
   />
 
-  <apn carrier="Orange SK MMS"
+  <apn carrier="Orange LTE"
+      carrier_id = "1713"
+      mcc="231"
+      mnc="01"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Orange MMS"
       carrier_id = "1713"
       mcc="231"
       mnc="01"
@@ -4408,19 +4533,26 @@
       mmsproxy="213.151.208.145"
       mmsport="8799"
       type="mms"
+      user_editable="false"
   />
 
-  <apn carrier="Orange World"
+  <apn carrier="Orange IMS"
       carrier_id = "1713"
       mcc="231"
       mnc="01"
-      apn="orangewap"
-      user="wap"
-      password="wap"
-      authtype="1"
-      proxy="213.151.208.156"
-      port="8799"
-      type="default,ia,supl"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Orange UT"
+      carrier_id = "1713"
+      mcc="231"
+      mnc="01"
+      apn="xcap"
+      type="xcap"
+      user_visible="false"
   />
 
   <apn carrier="T-Mobile internet"
@@ -4430,20 +4562,39 @@
       apn="internet"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="T-Mobile MMS"
+  <apn carrier="HOS"
       carrier_id = "2385"
       mcc="231"
       mnc="02"
-      apn="mms"
+      apn="hos"
       user="mms"
       password="mms"
       authtype="1"
-      mmsc="http://mms"
-      mmsproxy="192.168.1.1"
-      mmsport="8080"
-      type="mms"
+      mmsc="http://mmsc.telekom.sk"
+      type="mms,xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile IMS"
+      carrier_id = "2385"
+      mcc="231"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="4ka Internet"
+      mcc="231"
+      mnc="03"
+      apn="internet"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="4KA SK"
   />
 
   <apn carrier="O2 internet"
@@ -4466,19 +4617,22 @@
   />
 
   <apn carrier="live!"
+      carrier_id = "14"
       mcc="232"
       mnc="01"
-      apn="a1.net"
+      apn="A1.net"
       user="ppp@a1plus.at"
       password="ppp"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="A1 MMS"
+      carrier_id = "14"
       mcc="232"
       mnc="01"
-      apn="free.a1.net"
+      apn="free.A1.net"
       user="ppp@a1plus.at"
       password="ppp"
       mmsc="http://mmsc.a1.net"
@@ -4495,38 +4649,49 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
       user_visible="false"
   />
 
-  <apn carrier="T-Mobile Internet"
+  <apn carrier="T-Mobile LTE"
       mcc="232"
       mnc="03"
       apn=""
       type="ia"
   />
 
-  <apn carrier="T-Mobile LTE"
+  <apn carrier="T-Mobile A Internet"
       mcc="232"
       mnc="03"
       apn="internet.t-mobile.at"
-      user="t-mobile"
+      user="T"
       password="tm"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="T-Mobile MMS"
+  <apn carrier="T-Mobile IMS"
+      mcc="232"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="HOS"
       mcc="232"
       mnc="03"
-      apn="gprsmms"
+      apn="hos"
       user="t-mobile"
       password="tm"
       mmsc="http://mmsc.t-mobile.at/servlets/mms"
       mmsproxy="10.12.0.20"
       mmsport="80"
       authtype="1"
-      type="mms"
+      type="mms,xcap"
+      protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Goodspeed"
@@ -4539,6 +4704,41 @@
       mvno_match_data="C5"
   />
 
+  <apn carrier="T-Mobile A Internet"
+      mcc="232"
+      mnc="04"
+      apn="internet.t-mobile.at"
+      user="t-mobile"
+      password="tm"
+      authtype="1"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile IMS"
+      mcc="232"
+      mnc="04"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="HOS"
+      mcc="232"
+      mnc="04"
+      apn="hos"
+      user="t-mobile"
+      password="tm"
+      mmsc="http://mmsc.t-mobile.at/servlets/mms"
+      mmsproxy="10.12.0.20"
+      mmsport="80"
+      authtype="1"
+      type="xcap,mms"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="Planet 3"
       carrier_id = "1344"
       mcc="232"
@@ -4547,78 +4747,108 @@
       mmsc="http://mmsc"
       mmsproxy="213.94.78.133"
       mmsport="8799"
-      type="default,ia,supl,mms"
+      type="default,ia,supl,mms,xcap"
   />
 
-  <apn carrier="tele.ring mms"
+  <apn carrier="IMS"
+      carrier_id = "1344"
+      mcc="232"
+      mnc="05"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="HOS"
+      carrier_id = "2094"
       mcc="232"
       mnc="07"
-      apn="mms"
-      user="wap@telering.at"
-      password="wap"
-      mmsc="http://relay.mms.telering.at"
-      mmsproxy="212.95.31.50"
+      apn="hos"
+      user="t-mobile"
+      password="tm"
+      mmsc="http://mmsc.t-mobile.at/servlets/mms"
+      mmsproxy="10.12.0.20"
       mmsport="80"
       authtype="1"
-      type="mms"
+      type="mms,xcap"
+      protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="tele.ring web"
+  <apn carrier="T-Mobile IMS"
+      carrier_id = "2094"
       mcc="232"
       mnc="07"
-      apn="web"
-      user="web@telering.at"
-      password="web"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile A Internet"
+      carrier_id = "2094"
+      mcc="232"
+      mnc="07"
+      apn="internet.t-mobile.at"
+      user="T"
+      password="tm"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="0677 web"
+  <apn carrier="HoT Internet"
       mcc="232"
       mnc="07"
       apn="webaut"
+      authtype="1"
       type="default,ia,supl"
       mvno_type="imsi"
-      mvno_match_data="23207718"
+      mvno_match_data="23207761"
   />
 
-  <apn carrier="0677 mms"
+  <apn carrier="HoT MMS"
       mcc="232"
       mnc="07"
       apn="mmsaut"
+      authtype="1"
       mmsc="http://mmsaut.at/send"
       mmsproxy="212.095.031.050"
       mmsport="80"
       type="mms"
       mvno_type="imsi"
-      mvno_match_data="23207718"
+      mvno_match_data="23207761"
   />
 
   <apn carrier="0677 web"
       mcc="232"
       mnc="07"
       apn="webaut"
+      authtype="1"
       type="default,ia,supl"
       mvno_type="imsi"
-      mvno_match_data="2320776"
+      mvno_match_data="23207718"
   />
 
   <apn carrier="0677 mms"
       mcc="232"
       mnc="07"
       apn="mmsaut"
+      authtype="1"
       mmsc="http://mmsaut.at/send"
       mmsproxy="212.095.031.050"
       mmsport="80"
       type="mms"
       mvno_type="imsi"
-      mvno_match_data="2320776"
+      mvno_match_data="23207718"
   />
 
   <apn carrier="0677 web"
       mcc="232"
       mnc="07"
       apn="webaut"
+      authtype="1"
       type="default,ia,supl"
       mvno_type="imsi"
       mvno_match_data="23207799"
@@ -4628,6 +4858,7 @@
       mcc="232"
       mnc="07"
       apn="mmsaut"
+      authtype="1"
       mmsc="http://mmsaut.at/send"
       mmsproxy="212.095.031.050"
       mmsport="80"
@@ -4649,7 +4880,7 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Planet3"
+  <apn carrier="Planet 3"
       carrier_id = "1344"
       mcc="232"
       mnc="10"
@@ -4657,10 +4888,21 @@
       mmsc="http://mmsc"
       mmsproxy="213.94.78.133"
       mmsport="8799"
-      type="default,ia,supl,mms"
+      type="default,ia,supl,mms,xcap"
+  />
+
+  <apn carrier="IMS"
+      carrier_id = "1344"
+      mcc="232"
+      mnc="10"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
   />
 
   <apn carrier="data.bob"
+      carrier_id = "14"
       mcc="232"
       mnc="11"
       apn="bob.at"
@@ -4668,9 +4910,11 @@
       password="ppp"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="data.bob MMS"
+      carrier_id = "14"
       mcc="232"
       mnc="11"
       apn="mms.bob.at"
@@ -4691,7 +4935,42 @@
       protocol="IPV4V6"
   />
 
+  <apn carrier="UPC mobiles Internet"
+      mcc="232"
+      mnc="13"
+      apn="Internet.at.upcmobile.com"
+      type="default,ia,supl"
+      mvno_type="gid"
+      mvno_match_data="75617431"
+  />
+
+  <apn carrier="Planet 3"
+      mcc="232"
+      mnc="14"
+      apn="drei.at"
+      mmsc="http://mmsc"
+      mmsproxy="213.94.78.133"
+      mmsport="8799"
+      type="default,ia,supl,mms,xcap"
+  />
+
+  <apn carrier="IMS"
+      mcc="232"
+      mnc="14"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+  />
+
+  <apn carrier="Tele2 Web"
+      mcc="232"
+      mnc="19"
+      apn="internet.tele2.at"
+      type="default,ia,supl"
+  />
+
   <apn carrier="Plintron"
+      carrier_id = "2424"
       mcc="232"
       mnc="22"
       apn="data.plintron.at"
@@ -5463,6 +5742,38 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="MobileUC IMS"
+      carrier_id = "10031"
+      mcc="234"
+      mnc="53"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="MobileUC Hotspot"
+      carrier_id = "10031"
+      mcc="234"
+      mnc="53"
+      apn="globalhotspot"
+      type="dun"
+      user_visible="false"
+  />
+
+  <apn carrier="MobileUC"
+      carrier_id = "10031"
+      mcc="234"
+      mnc="53"
+      apn="globaldata"
+      type="default,ia,mms,supl,hipri,fota"
+      mmsc="http://mms.mobileuc.global/"
+      mmsproxy="37.18.129.98"
+      mmsport="8008"
+      user_editable="false"
+  />
+
   <apn carrier="C&amp;W Guernsey Internet"
       carrier_id = "720"
       mcc="234"
@@ -7873,6 +8184,58 @@
      mvno_type="imsi"
   />
 
+  <apn carrier="1and1 Internet"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="03"
+      apn="internet"
+      mmsc="http://10.81.0.7:8002"
+      mmsproxy="82.113.100.5"
+      mmsport="8080"
+      type="default,ia,supl,mms"
+      mvno_match_data="26203293"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="1and1 IMS"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+      mvno_match_data="26203293"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="1and1 Internet"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="03"
+      apn="internet"
+      mmsc="http://10.81.0.7:8002"
+      mmsproxy="82.113.100.5"
+      mmsport="8080"
+      type="default,ia,supl,mms"
+      mvno_match_data="26203330"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="1and1 IMS"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+      mvno_match_data="26203330"
+      mvno_type="imsi"
+  />
+
   <apn carrier="Telekom Internet"
       carrier_id = "3"
       mcc="262"
@@ -7986,6 +8349,84 @@
       mvno_type="imsi"
   />
 
+  <apn carrier="1and1 Internet"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="07"
+      apn="internet"
+      mmsc="http://10.81.0.7:8002"
+      mmsproxy="82.113.100.5"
+      mmsport="8080"
+      type="default,ia,supl,mms"
+      mvno_match_data="118004"
+      mvno_type="gid"
+  />
+
+  <apn carrier="1and1 IMS"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="07"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+      mvno_match_data="118004"
+      mvno_type="gid"
+  />
+
+  <apn carrier="1and1 Internet"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="07"
+      apn="internet"
+      mmsc="http://10.81.0.7:8002"
+      mmsproxy="82.113.100.5"
+      mmsport="8080"
+      type="default,ia,supl,mms"
+      mvno_match_data="118006"
+      mvno_type="gid"
+  />
+
+  <apn carrier="1and1 IMS"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="07"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+      mvno_match_data="118006"
+      mvno_type="gid"
+  />
+
+  <apn carrier="1and1 Internet"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="07"
+      apn="internet"
+      mmsc="http://10.81.0.7:8002"
+      mmsproxy="82.113.100.5"
+      mmsport="8080"
+      type="default,ia,supl,mms"
+      mvno_match_data="250109"
+      mvno_type="gid"
+  />
+
+  <apn carrier="1and1 IMS"
+      carrier_id = "2536"
+      mcc="262"
+      mnc="07"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+      mvno_match_data="250109"
+      mvno_type="gid"
+  />
+
   <apn carrier="O2 DE IMS"
       carrier_id = "1454"
       mcc="262"
@@ -10190,7 +10631,7 @@
       type="mms"
   />
 
-  <!-- Need two APNs for CDMA technologies: a default,ia that is used normally -->
+  <!-- Need two APNs for CDMA technologies: a default that is used normally -->
   <!-- and a second APN to be used when DUN is required.  Even though the -->
   <!-- parameters appear the same, the profileID sent to the radio when requesting -->
   <!-- a DUN connection will be different -->
@@ -10784,7 +11225,7 @@
       type="default,ia,supl"
   />
 
-  <!-- Need two APNs for CDMA technologies: a default,ia that is used normally -->
+  <!-- Need two APNs for CDMA technologies: a default that is used normally -->
   <!-- and a second APN to be used when DUN is required.  Even though the -->
   <!-- parameters appear the same, the profileID sent to the radio when requesting -->
   <!-- a DUN connection will be different -->
@@ -11511,7 +11952,7 @@
       proxy=""
       port=""
       mmsc="http://mmsc.mobile.att.net"
-      mmsproxy="http://proxy.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
       mmsport="80"
       type="default,ia,mms,supl"
       protocol="IPV4V6"
@@ -12011,7 +12452,7 @@
       proxy=""
       port=""
       mmsc="http://mmsc.mobile.att.net"
-      mmsproxy="http://proxy.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
       mmsport="80"
       type="default,ia,mms,supl"
       protocol="IPV4V6"
@@ -15731,7 +16172,7 @@
       bearer_bitmask="14"
   />
 
-  <!-- Need two APNs for CDMA technologies: a default,ia that is used normally -->
+  <!-- Need two APNs for CDMA technologies: a default that is used normally -->
   <!-- and a second APN to be used when DUN is required.  Even though the -->
   <!-- parameters appear the same, the profileID sent to the radio when requesting -->
   <!-- a DUN connection will be different -->
@@ -17238,6 +17679,38 @@
       type="default,ia"
   />
 
+ <apn carrier="MobileUC IMS"
+      carrier_id = "10030"
+      mcc="313"
+      mnc="770"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="MobileUC Hotspot"
+      carrier_id = "10030"
+      mcc="313"
+      mnc="770"
+      apn="globalhotspot"
+      type="dun"
+      user_visible="false"
+  />
+
+  <apn carrier="MobileUC"
+      carrier_id = "10030"
+      mcc="313"
+      mnc="770"
+      apn="globaldata"
+      type="default,ia,mms,supl,hipri,fota"
+      mmsc="http://mms.mobileuc.global/"
+      mmsproxy="37.18.129.98"
+      mmsport="8008"
+      user_editable="false"
+  />
+
   <apn carrier="openmobile"
       mcc="330"
       mnc="000"
@@ -19654,7 +20127,7 @@
       carrier_id = "1354"
       mcc="400"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -19662,7 +20135,7 @@
       carrier_id = "495"
       mcc="400"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -19670,7 +20143,7 @@
       carrier_id = "1355"
       mcc="400"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -19678,7 +20151,7 @@
       carrier_id = "1356"
       mcc="400"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -19775,7 +20248,7 @@
       carrier_id = "564"
       mcc="402"
       mnc="11"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
       protocol="IPV4V6"
   />
@@ -28431,7 +28904,7 @@
       carrier_id = "452"
       mcc="412"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28439,7 +28912,7 @@
       carrier_id = "453"
       mcc="412"
       mnc="20"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28447,7 +28920,7 @@
       carrier_id = "455"
       mcc="412"
       mnc="40"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28455,7 +28928,7 @@
       carrier_id = "2221"
       mcc="412"
       mnc="50"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28463,7 +28936,7 @@
       carrier_id = "1931"
       mcc="413"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28471,7 +28944,7 @@
       carrier_id = "1599"
       mcc="413"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28479,7 +28952,7 @@
       carrier_id = "1600"
       mcc="413"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28487,7 +28960,7 @@
       carrier_id = "1932"
       mcc="413"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28495,7 +28968,7 @@
       carrier_id = "1933"
       mcc="413"
       mnc="08"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28503,7 +28976,7 @@
       carrier_id = "1611"
       mcc="414"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28802,7 +29275,7 @@
       carrier_id = "2166"
       mcc="418"
       mnc="08"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28900,7 +29373,7 @@
       carrier_id = "2345"
       mcc="418"
       mnc="45"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28908,7 +29381,7 @@
       carrier_id = "2234"
       mcc="418"
       mnc="62"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28916,7 +29389,7 @@
       carrier_id = "2167"
       mcc="418"
       mnc="92"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29093,7 +29566,7 @@
       carrier_id = "1877"
       mcc="421"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29115,7 +29588,7 @@
       carrier_id = "1878"
       mcc="421"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29147,7 +29620,7 @@
       carrier_id = "2168"
       mcc="421"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29636,7 +30109,7 @@
       carrier_id = "2347"
       mcc="428"
       mnc="88"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29644,7 +30117,7 @@
       carrier_id = "2172"
       mcc="428"
       mnc="91"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29652,7 +30125,7 @@
       carrier_id = "2173"
       mcc="428"
       mnc="98"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29660,7 +30133,7 @@
       carrier_id = "1612"
       mcc="428"
       mnc="99"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29668,7 +30141,7 @@
       carrier_id = "962"
       mcc="429"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29676,7 +30149,7 @@
       carrier_id = "1923"
       mcc="429"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29684,7 +30157,7 @@
       carrier_id = "962"
       mcc="429"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29692,7 +30165,7 @@
       carrier_id = "1924"
       mcc="429"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29876,7 +30349,7 @@
       carrier_id = "2235"
       mcc="434"
       mnc="06"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29906,7 +30379,7 @@
       carrier_id = "1724"
       mcc="436"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29914,7 +30387,7 @@
       carrier_id = "1725"
       mcc="436"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29922,7 +30395,7 @@
       carrier_id = "1726"
       mcc="436"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29930,7 +30403,7 @@
       carrier_id = "1727"
       mcc="436"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29938,7 +30411,7 @@
       carrier_id = "1728"
       mcc="436"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29946,7 +30419,7 @@
       carrier_id = "2174"
       mcc="436"
       mnc="12"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29954,7 +30427,7 @@
       carrier_id = "867"
       mcc="437"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29962,7 +30435,7 @@
       carrier_id = "2175"
       mcc="437"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29970,7 +30443,7 @@
       carrier_id = "2176"
       mcc="437"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29978,7 +30451,7 @@
       carrier_id = "2177"
       mcc="437"
       mnc="09"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29986,7 +30459,7 @@
       carrier_id = "1729"
       mcc="438"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29994,7 +30467,7 @@
       carrier_id = "1730"
       mcc="438"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30838,7 +31311,7 @@
       carrier_id = "868"
       mcc="456"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30846,7 +31319,7 @@
       carrier_id = "869"
       mcc="456"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30854,7 +31327,7 @@
       carrier_id = "2180"
       mcc="456"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30862,7 +31335,7 @@
       carrier_id = "869"
       mcc="456"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30870,7 +31343,7 @@
       carrier_id = "869"
       mcc="456"
       mnc="06"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30878,14 +31351,14 @@
       carrier_id = "2181"
       mcc="456"
       mnc="08"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
   <apn carrier="Beeline"
       mcc="456"
       mnc="09"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30893,7 +31366,7 @@
       carrier_id = "2236"
       mcc="456"
       mnc="11"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30901,7 +31374,7 @@
       carrier_id = "871"
       mcc="456"
       mnc="18"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30909,7 +31382,7 @@
       carrier_id = "1590"
       mcc="457"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30917,7 +31390,7 @@
       carrier_id = "1591"
       mcc="457"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30925,7 +31398,7 @@
       carrier_id = "2346"
       mcc="457"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30933,7 +31406,7 @@
       carrier_id = "1592"
       mcc="457"
       mnc="08"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31375,7 +31848,7 @@
       carrier_id = "1624"
       mcc="472"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31757,6 +32230,45 @@
       mvno_match_data="547275554B3030656E"
   />
 
+  <apn carrier="OptiTel"
+      carrier_id = "2535"
+      mcc="505"
+      mnc="52"
+      apn="optitel"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="OptiTel IMS"
+      carrier_id = "2535"
+      mcc="505"
+      mnc="52"
+      apn="optitel.ims"
+      type="ims"
+  />
+
+  <apn carrier="OptiTel MMS"
+      carrier_id = "2535"
+      mcc="505"
+      mnc="52"
+      apn="optitel.mms"
+      type="mms"
+      mmsc="http://mmsc.opti.tel"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="OptiTel MCX"
+      carrier_id = "2535"
+      mcc="505"
+      mnc="52"
+      apn="optitel.mcx"
+      type="mcx"
+      protocol="IP"
+      roaming_protocol="IP"
+  />
+
   <apn carrier="Telstra IMS"
       carrier_id = "1345"
       mcc="505"
@@ -32100,7 +32612,7 @@
       carrier_id = "2182"
       mcc="514"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32108,7 +32620,7 @@
       carrier_id = "2183"
       mcc="514"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32116,7 +32628,7 @@
       carrier_id = "2268"
       mcc="514"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32564,7 +33076,7 @@
       carrier_id = "2350"
       mcc="528"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32572,7 +33084,7 @@
       carrier_id = "1379"
       mcc="528"
       mnc="11"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32691,7 +33203,7 @@
   <apn carrier="Digicel"
       mcc="536"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32699,7 +33211,7 @@
       carrier_id = "1649"
       mcc="537"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32758,7 +33270,7 @@
       carrier_id = "1733"
       mcc="539"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32766,7 +33278,7 @@
       carrier_id = "1734"
       mcc="539"
       mnc="43"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32774,7 +33286,7 @@
       carrier_id = "2220"
       mcc="539"
       mnc="88"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32806,7 +33318,7 @@
       carrier_id = "2185"
       mcc="540"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32814,7 +33326,7 @@
       carrier_id = "2123"
       mcc="540"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32822,7 +33334,7 @@
       carrier_id = "2239"
       mcc="541"
       mnc="00"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32830,7 +33342,7 @@
       carrier_id = "1301"
       mcc="541"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32838,7 +33350,7 @@
       carrier_id = "2219"
       mcc="541"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32870,7 +33382,7 @@
       carrier_id = "1481"
       mcc="542"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32878,7 +33390,7 @@
       carrier_id = "2186"
       mcc="542"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32910,7 +33422,7 @@
       carrier_id = "1957"
       mcc="544"
       mnc="11"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32918,7 +33430,7 @@
       carrier_id = "2240"
       mcc="545"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32926,7 +33438,7 @@
       carrier_id = "2187"
       mcc="545"
       mnc="09"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32934,7 +33446,7 @@
       carrier_id = "943"
       mcc="546"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32942,7 +33454,7 @@
       carrier_id = "1648"
       mcc="547"
       mnc="20"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32950,7 +33462,7 @@
       carrier_id = "1426"
       mcc="548"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32958,7 +33470,7 @@
       carrier_id = "1302"
       mcc="549"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32966,7 +33478,7 @@
       carrier_id = "1876"
       mcc="549"
       mnc="27"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32974,14 +33486,14 @@
       carrier_id = "1482"
       mcc="550"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
   <apn carrier="MINTA"
       mcc="551"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32989,7 +33501,7 @@
       carrier_id = "1671"
       mcc="552"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32997,7 +33509,7 @@
       carrier_id = "2188"
       mcc="552"
       mnc="80"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33339,7 +33851,7 @@
       carrier_id = "1973"
       mcc="606"
       mnc="00"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33359,7 +33871,7 @@
       carrier_id = "2006"
       mcc="606"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33367,7 +33879,7 @@
       carrier_id = "2189"
       mcc="606"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33375,7 +33887,7 @@
       carrier_id = "2348"
       mcc="606"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33383,7 +33895,7 @@
       carrier_id = "2190"
       mcc="606"
       mnc="06"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33391,7 +33903,7 @@
       carrier_id = "736"
       mcc="607"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33399,7 +33911,7 @@
       carrier_id = "737"
       mcc="607"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33407,7 +33919,7 @@
       carrier_id = "738"
       mcc="607"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33415,7 +33927,7 @@
       carrier_id = "2191"
       mcc="607"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33478,7 +33990,7 @@
       carrier_id = "1616"
       mcc="609"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33486,7 +33998,7 @@
       carrier_id = "1617"
       mcc="609"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33494,7 +34006,7 @@
       carrier_id = "1618"
       mcc="609"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33538,7 +34050,7 @@
       carrier_id = "739"
       mcc="611"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33546,7 +34058,7 @@
       carrier_id = "740"
       mcc="611"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33554,7 +34066,7 @@
       carrier_id = "2193"
       mcc="611"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33562,7 +34074,7 @@
       carrier_id = "2225"
       mcc="611"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33570,7 +34082,7 @@
       carrier_id = "741"
       mcc="611"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33648,7 +34160,7 @@
       carrier_id = "1946"
       mcc="613"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33656,7 +34168,7 @@
       carrier_id = "1368"
       mcc="613"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33664,7 +34176,7 @@
       carrier_id = "1369"
       mcc="613"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33693,7 +34205,7 @@
       carrier_id = "1095"
       mcc="615"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33701,7 +34213,7 @@
       carrier_id = "1947"
       mcc="615"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33709,7 +34221,7 @@
       carrier_id = "1376"
       mcc="616"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33717,7 +34229,7 @@
       carrier_id = "1377"
       mcc="616"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33725,7 +34237,7 @@
       carrier_id = "1378"
       mcc="616"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33733,7 +34245,7 @@
       carrier_id = "1944"
       mcc="616"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33741,7 +34253,7 @@
       carrier_id = "1945"
       mcc="616"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33770,7 +34282,7 @@
       carrier_id = "2194"
       mcc="618"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33778,7 +34290,7 @@
       carrier_id = "2195"
       mcc="618"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33786,7 +34298,7 @@
       carrier_id = "1601"
       mcc="618"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33802,7 +34314,7 @@
       carrier_id = "2196"
       mcc="618"
       mnc="20"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33810,7 +34322,7 @@
       carrier_id = "1716"
       mcc="619"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33818,7 +34330,7 @@
       carrier_id = "1717"
       mcc="619"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33826,7 +34338,7 @@
       carrier_id = "1718"
       mcc="619"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33834,7 +34346,7 @@
       carrier_id = "1074"
       mcc="619"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33842,7 +34354,7 @@
       carrier_id = "1075"
       mcc="619"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33850,7 +34362,7 @@
       carrier_id = "1076"
       mcc="619"
       mnc="25"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34086,7 +34598,7 @@
       carrier_id = "1093"
       mcc="622"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34094,7 +34606,7 @@
       carrier_id = "1094"
       mcc="622"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34102,7 +34614,7 @@
       carrier_id = "2227"
       mcc="622"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34110,7 +34622,7 @@
       carrier_id = "2197"
       mcc="622"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34118,7 +34630,7 @@
       carrier_id = "1408"
       mcc="623"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34126,7 +34638,7 @@
       carrier_id = "1409"
       mcc="623"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34142,7 +34654,7 @@
       carrier_id = "2198"
       mcc="623"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34165,7 +34677,7 @@
       carrier_id = "1445"
       mcc="625"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34173,7 +34685,7 @@
       carrier_id = "1446"
       mcc="625"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34181,7 +34693,7 @@
       carrier_id = "1086"
       mcc="626"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34189,7 +34701,7 @@
       carrier_id = "746"
       mcc="627"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34211,7 +34723,7 @@
       carrier_id = "2199"
       mcc="627"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34219,7 +34731,7 @@
       carrier_id = "1488"
       mcc="628"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34227,7 +34739,7 @@
       carrier_id = "1489"
       mcc="628"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34235,7 +34747,7 @@
       carrier_id = "1490"
       mcc="628"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34243,7 +34755,7 @@
       carrier_id = "2200"
       mcc="628"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34251,7 +34763,7 @@
       carrier_id = "1411"
       mcc="629"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34259,7 +34771,7 @@
       carrier_id = "1412"
       mcc="629"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34296,7 +34808,7 @@
       carrier_id = "1334"
       mcc="631"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34304,7 +34816,7 @@
       carrier_id = "2201"
       mcc="631"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34312,7 +34824,7 @@
       carrier_id = "1524"
       mcc="632"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34328,7 +34840,7 @@
       carrier_id = "2241"
       mcc="632"
       mnc="07"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34336,7 +34848,7 @@
       carrier_id = "1685"
       mcc="633"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34344,7 +34856,7 @@
       carrier_id = "1686"
       mcc="633"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34352,7 +34864,7 @@
       carrier_id = "1687"
       mcc="633"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34360,7 +34872,7 @@
       carrier_id = "1688"
       mcc="634"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34368,7 +34880,7 @@
       carrier_id = "1689"
       mcc="634"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34376,7 +34888,7 @@
       carrier_id = "2202"
       mcc="634"
       mnc="07"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34384,7 +34896,7 @@
       carrier_id = "2242"
       mcc="634"
       mnc="09"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34392,7 +34904,7 @@
       carrier_id = "1682"
       mcc="635"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34400,7 +34912,7 @@
       carrier_id = "2243"
       mcc="635"
       mnc="12"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34408,7 +34920,7 @@
       carrier_id = "2203"
       mcc="635"
       mnc="13"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34416,7 +34928,7 @@
       carrier_id = "2204"
       mcc="635"
       mnc="14"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34424,7 +34936,7 @@
       carrier_id = "681"
       mcc="636"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34432,7 +34944,7 @@
       carrier_id = "2205"
       mcc="637"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34440,7 +34952,7 @@
       carrier_id = "2244"
       mcc="637"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34448,7 +34960,7 @@
       carrier_id = "2206"
       mcc="637"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34456,7 +34968,7 @@
       carrier_id = "2245"
       mcc="637"
       mnc="25"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34464,7 +34976,7 @@
       carrier_id = "1082"
       mcc="637"
       mnc="30"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34472,14 +34984,14 @@
       carrier_id = "2246"
       mcc="637"
       mnc="57"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
   <apn carrier="Nationlink Telecom"
       mcc="637"
       mnc="60"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34487,7 +34999,7 @@
       carrier_id = "2207"
       mcc="637"
       mnc="71"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34495,7 +35007,7 @@
       carrier_id = "2208"
       mcc="637"
       mnc="82"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34503,7 +35015,7 @@
       carrier_id = "1462"
       mcc="638"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34726,7 +35238,7 @@
       carrier_id = "1373"
       mcc="642"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34734,7 +35246,7 @@
       carrier_id = "1374"
       mcc="642"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34742,7 +35254,7 @@
       carrier_id = "1375"
       mcc="642"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34750,7 +35262,7 @@
       carrier_id = "2355"
       mcc="642"
       mnc="07"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34758,7 +35270,7 @@
       carrier_id = "2211"
       mcc="642"
       mnc="08"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34766,7 +35278,7 @@
       carrier_id = "2212"
       mcc="642"
       mnc="82"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34774,7 +35286,7 @@
       carrier_id = "1634"
       mcc="643"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34782,7 +35294,7 @@
       carrier_id = "2213"
       mcc="643"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34790,7 +35302,7 @@
       carrier_id = "2381"
       mcc="643"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34798,7 +35310,7 @@
       carrier_id = "1319"
       mcc="645"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34806,7 +35318,7 @@
       carrier_id = "1320"
       mcc="645"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34814,7 +35326,7 @@
       carrier_id = "1321"
       mcc="645"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34981,7 +35493,7 @@
       carrier_id = "1879"
       mcc="648"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34989,7 +35501,7 @@
       carrier_id = "1880"
       mcc="648"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34997,7 +35509,7 @@
       carrier_id = "941"
       mcc="649"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35005,7 +35517,7 @@
       carrier_id = "2214"
       mcc="649"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35013,7 +35525,7 @@
       carrier_id = "942"
       mcc="649"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35021,7 +35533,7 @@
       carrier_id = "1625"
       mcc="650"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35029,7 +35541,7 @@
       carrier_id = "1626"
       mcc="650"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35077,7 +35589,7 @@
       carrier_id = "1091"
       mcc="653"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35085,7 +35597,7 @@
       carrier_id = "872"
       mcc="654"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35258,7 +35770,7 @@
       carrier_id = "2247"
       mcc="657"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35266,7 +35778,7 @@
       carrier_id = "570"
       mcc="702"
       mnc="67"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35274,7 +35786,7 @@
       carrier_id = "2354"
       mcc="702"
       mnc="99"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -37692,7 +38204,7 @@
       carrier_id = "1525"
       mcc="738"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -37728,7 +38240,7 @@
       carrier_id = "2217"
       mcc="738"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -37932,7 +38444,7 @@
       carrier_id = "1083"
       mcc="746"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -38090,13 +38602,13 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="ATT 5G NSA default,ia"
+  <apn carrier="ATT 5G NSA default"
       carrier_id = "10021"
       apn="enhancedphone"
       type="default,ia,mms,supl,fota"
       mmsc="http://mmsc.mobile.att.net"
-      mmsc_proxy="proxy.mobile.att.net"
-      mmsc_proxy_port="80"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       user_editable="false"
@@ -38135,8 +38647,8 @@
       apn="nrphone"
       type="default,ia,mms,supl,fota"
       mmsc="http://mmsc.mobile.att.net"
-      mmsc_proxy="proxy.mobile.att.net"
-      mmsc_proxy_port="80"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       user_editable="false"
@@ -38169,4 +38681,5 @@
       roaming_protocol="IPV4V6"
       user_visible="false"
   />
+
 </apns>