Merge "Correct APNs with apn attribute default"

2 files changed, 205 insertions, 200 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 142a3ce..ec9580a 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -10631,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 -->
@@ -11225,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 -->
@@ -16172,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 -->
@@ -20127,7 +20127,7 @@
       carrier_id = "1354"
       mcc="400"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -20135,7 +20135,7 @@
       carrier_id = "495"
       mcc="400"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -20143,7 +20143,7 @@
       carrier_id = "1355"
       mcc="400"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -20151,7 +20151,7 @@
       carrier_id = "1356"
       mcc="400"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -20248,7 +20248,7 @@
       carrier_id = "564"
       mcc="402"
       mnc="11"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
       protocol="IPV4V6"
   />
@@ -28904,7 +28904,7 @@
       carrier_id = "452"
       mcc="412"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28912,7 +28912,7 @@
       carrier_id = "453"
       mcc="412"
       mnc="20"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28920,7 +28920,7 @@
       carrier_id = "455"
       mcc="412"
       mnc="40"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28928,7 +28928,7 @@
       carrier_id = "2221"
       mcc="412"
       mnc="50"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28936,7 +28936,7 @@
       carrier_id = "1931"
       mcc="413"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28944,7 +28944,7 @@
       carrier_id = "1599"
       mcc="413"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28952,7 +28952,7 @@
       carrier_id = "1600"
       mcc="413"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28960,7 +28960,7 @@
       carrier_id = "1932"
       mcc="413"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28968,7 +28968,7 @@
       carrier_id = "1933"
       mcc="413"
       mnc="08"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -28976,7 +28976,7 @@
       carrier_id = "1611"
       mcc="414"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29275,7 +29275,7 @@
       carrier_id = "2166"
       mcc="418"
       mnc="08"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29373,7 +29373,7 @@
       carrier_id = "2345"
       mcc="418"
       mnc="45"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29381,7 +29381,7 @@
       carrier_id = "2234"
       mcc="418"
       mnc="62"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29389,7 +29389,7 @@
       carrier_id = "2167"
       mcc="418"
       mnc="92"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29566,7 +29566,7 @@
       carrier_id = "1877"
       mcc="421"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29588,7 +29588,7 @@
       carrier_id = "1878"
       mcc="421"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -29620,7 +29620,7 @@
       carrier_id = "2168"
       mcc="421"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30109,7 +30109,7 @@
       carrier_id = "2347"
       mcc="428"
       mnc="88"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30117,7 +30117,7 @@
       carrier_id = "2172"
       mcc="428"
       mnc="91"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30125,7 +30125,7 @@
       carrier_id = "2173"
       mcc="428"
       mnc="98"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30133,7 +30133,7 @@
       carrier_id = "1612"
       mcc="428"
       mnc="99"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30141,7 +30141,7 @@
       carrier_id = "962"
       mcc="429"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30149,7 +30149,7 @@
       carrier_id = "1923"
       mcc="429"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30157,7 +30157,7 @@
       carrier_id = "962"
       mcc="429"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30165,7 +30165,7 @@
       carrier_id = "1924"
       mcc="429"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30349,7 +30349,7 @@
       carrier_id = "2235"
       mcc="434"
       mnc="06"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30379,7 +30379,7 @@
       carrier_id = "1724"
       mcc="436"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30387,7 +30387,7 @@
       carrier_id = "1725"
       mcc="436"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30395,7 +30395,7 @@
       carrier_id = "1726"
       mcc="436"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30403,7 +30403,7 @@
       carrier_id = "1727"
       mcc="436"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30411,7 +30411,7 @@
       carrier_id = "1728"
       mcc="436"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30419,7 +30419,7 @@
       carrier_id = "2174"
       mcc="436"
       mnc="12"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30427,7 +30427,7 @@
       carrier_id = "867"
       mcc="437"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30435,7 +30435,7 @@
       carrier_id = "2175"
       mcc="437"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30443,7 +30443,7 @@
       carrier_id = "2176"
       mcc="437"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30451,7 +30451,7 @@
       carrier_id = "2177"
       mcc="437"
       mnc="09"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30459,7 +30459,7 @@
       carrier_id = "1729"
       mcc="438"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -30467,7 +30467,7 @@
       carrier_id = "1730"
       mcc="438"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31311,7 +31311,7 @@
       carrier_id = "868"
       mcc="456"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31319,7 +31319,7 @@
       carrier_id = "869"
       mcc="456"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31327,7 +31327,7 @@
       carrier_id = "2180"
       mcc="456"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31335,7 +31335,7 @@
       carrier_id = "869"
       mcc="456"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31343,7 +31343,7 @@
       carrier_id = "869"
       mcc="456"
       mnc="06"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31351,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"
   />
 
@@ -31366,7 +31366,7 @@
       carrier_id = "2236"
       mcc="456"
       mnc="11"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31374,7 +31374,7 @@
       carrier_id = "871"
       mcc="456"
       mnc="18"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31382,7 +31382,7 @@
       carrier_id = "1590"
       mcc="457"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31390,7 +31390,7 @@
       carrier_id = "1591"
       mcc="457"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31398,7 +31398,7 @@
       carrier_id = "2346"
       mcc="457"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31406,7 +31406,7 @@
       carrier_id = "1592"
       mcc="457"
       mnc="08"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -31848,7 +31848,7 @@
       carrier_id = "1624"
       mcc="472"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32612,7 +32612,7 @@
       carrier_id = "2182"
       mcc="514"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32620,7 +32620,7 @@
       carrier_id = "2183"
       mcc="514"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -32628,7 +32628,7 @@
       carrier_id = "2268"
       mcc="514"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33076,7 +33076,7 @@
       carrier_id = "2350"
       mcc="528"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33084,7 +33084,7 @@
       carrier_id = "1379"
       mcc="528"
       mnc="11"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33203,7 +33203,7 @@
   <apn carrier="Digicel"
       mcc="536"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33211,7 +33211,7 @@
       carrier_id = "1649"
       mcc="537"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33270,7 +33270,7 @@
       carrier_id = "1733"
       mcc="539"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33278,7 +33278,7 @@
       carrier_id = "1734"
       mcc="539"
       mnc="43"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33286,7 +33286,7 @@
       carrier_id = "2220"
       mcc="539"
       mnc="88"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33318,7 +33318,7 @@
       carrier_id = "2185"
       mcc="540"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33326,7 +33326,7 @@
       carrier_id = "2123"
       mcc="540"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33334,7 +33334,7 @@
       carrier_id = "2239"
       mcc="541"
       mnc="00"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33342,7 +33342,7 @@
       carrier_id = "1301"
       mcc="541"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33350,7 +33350,7 @@
       carrier_id = "2219"
       mcc="541"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33382,7 +33382,7 @@
       carrier_id = "1481"
       mcc="542"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33390,7 +33390,7 @@
       carrier_id = "2186"
       mcc="542"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33422,7 +33422,7 @@
       carrier_id = "1957"
       mcc="544"
       mnc="11"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33430,7 +33430,7 @@
       carrier_id = "2240"
       mcc="545"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33438,7 +33438,7 @@
       carrier_id = "2187"
       mcc="545"
       mnc="09"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33446,7 +33446,7 @@
       carrier_id = "943"
       mcc="546"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33454,7 +33454,7 @@
       carrier_id = "1648"
       mcc="547"
       mnc="20"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33462,7 +33462,7 @@
       carrier_id = "1426"
       mcc="548"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33470,7 +33470,7 @@
       carrier_id = "1302"
       mcc="549"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33478,7 +33478,7 @@
       carrier_id = "1876"
       mcc="549"
       mnc="27"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33486,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"
   />
 
@@ -33501,7 +33501,7 @@
       carrier_id = "1671"
       mcc="552"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33509,7 +33509,7 @@
       carrier_id = "2188"
       mcc="552"
       mnc="80"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33851,7 +33851,7 @@
       carrier_id = "1973"
       mcc="606"
       mnc="00"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33871,7 +33871,7 @@
       carrier_id = "2006"
       mcc="606"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33879,7 +33879,7 @@
       carrier_id = "2189"
       mcc="606"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33887,7 +33887,7 @@
       carrier_id = "2348"
       mcc="606"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33895,7 +33895,7 @@
       carrier_id = "2190"
       mcc="606"
       mnc="06"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33903,7 +33903,7 @@
       carrier_id = "736"
       mcc="607"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33911,7 +33911,7 @@
       carrier_id = "737"
       mcc="607"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33919,7 +33919,7 @@
       carrier_id = "738"
       mcc="607"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33927,7 +33927,7 @@
       carrier_id = "2191"
       mcc="607"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33990,7 +33990,7 @@
       carrier_id = "1616"
       mcc="609"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -33998,7 +33998,7 @@
       carrier_id = "1617"
       mcc="609"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34006,7 +34006,7 @@
       carrier_id = "1618"
       mcc="609"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34050,7 +34050,7 @@
       carrier_id = "739"
       mcc="611"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34058,7 +34058,7 @@
       carrier_id = "740"
       mcc="611"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34066,7 +34066,7 @@
       carrier_id = "2193"
       mcc="611"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34074,7 +34074,7 @@
       carrier_id = "2225"
       mcc="611"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34082,7 +34082,7 @@
       carrier_id = "741"
       mcc="611"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34160,7 +34160,7 @@
       carrier_id = "1946"
       mcc="613"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34168,7 +34168,7 @@
       carrier_id = "1368"
       mcc="613"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34176,7 +34176,7 @@
       carrier_id = "1369"
       mcc="613"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34205,7 +34205,7 @@
       carrier_id = "1095"
       mcc="615"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34213,7 +34213,7 @@
       carrier_id = "1947"
       mcc="615"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34221,7 +34221,7 @@
       carrier_id = "1376"
       mcc="616"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34229,7 +34229,7 @@
       carrier_id = "1377"
       mcc="616"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34237,7 +34237,7 @@
       carrier_id = "1378"
       mcc="616"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34245,7 +34245,7 @@
       carrier_id = "1944"
       mcc="616"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34253,7 +34253,7 @@
       carrier_id = "1945"
       mcc="616"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34282,7 +34282,7 @@
       carrier_id = "2194"
       mcc="618"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34290,7 +34290,7 @@
       carrier_id = "2195"
       mcc="618"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34298,7 +34298,7 @@
       carrier_id = "1601"
       mcc="618"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34314,7 +34314,7 @@
       carrier_id = "2196"
       mcc="618"
       mnc="20"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34322,7 +34322,7 @@
       carrier_id = "1716"
       mcc="619"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34330,7 +34330,7 @@
       carrier_id = "1717"
       mcc="619"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34338,7 +34338,7 @@
       carrier_id = "1718"
       mcc="619"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34346,7 +34346,7 @@
       carrier_id = "1074"
       mcc="619"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34354,7 +34354,7 @@
       carrier_id = "1075"
       mcc="619"
       mnc="05"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34362,7 +34362,7 @@
       carrier_id = "1076"
       mcc="619"
       mnc="25"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34598,7 +34598,7 @@
       carrier_id = "1093"
       mcc="622"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34606,7 +34606,7 @@
       carrier_id = "1094"
       mcc="622"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34614,7 +34614,7 @@
       carrier_id = "2227"
       mcc="622"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34622,7 +34622,7 @@
       carrier_id = "2197"
       mcc="622"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34630,7 +34630,7 @@
       carrier_id = "1408"
       mcc="623"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34638,7 +34638,7 @@
       carrier_id = "1409"
       mcc="623"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34654,7 +34654,7 @@
       carrier_id = "2198"
       mcc="623"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34677,7 +34677,7 @@
       carrier_id = "1445"
       mcc="625"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34685,7 +34685,7 @@
       carrier_id = "1446"
       mcc="625"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34693,7 +34693,7 @@
       carrier_id = "1086"
       mcc="626"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34701,7 +34701,7 @@
       carrier_id = "746"
       mcc="627"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34723,7 +34723,7 @@
       carrier_id = "2199"
       mcc="627"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34731,7 +34731,7 @@
       carrier_id = "1488"
       mcc="628"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34739,7 +34739,7 @@
       carrier_id = "1489"
       mcc="628"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34747,7 +34747,7 @@
       carrier_id = "1490"
       mcc="628"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34755,7 +34755,7 @@
       carrier_id = "2200"
       mcc="628"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34763,7 +34763,7 @@
       carrier_id = "1411"
       mcc="629"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34771,7 +34771,7 @@
       carrier_id = "1412"
       mcc="629"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34808,7 +34808,7 @@
       carrier_id = "1334"
       mcc="631"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34816,7 +34816,7 @@
       carrier_id = "2201"
       mcc="631"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34824,7 +34824,7 @@
       carrier_id = "1524"
       mcc="632"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34840,7 +34840,7 @@
       carrier_id = "2241"
       mcc="632"
       mnc="07"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34848,7 +34848,7 @@
       carrier_id = "1685"
       mcc="633"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34856,7 +34856,7 @@
       carrier_id = "1686"
       mcc="633"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34864,7 +34864,7 @@
       carrier_id = "1687"
       mcc="633"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34872,7 +34872,7 @@
       carrier_id = "1688"
       mcc="634"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34880,7 +34880,7 @@
       carrier_id = "1689"
       mcc="634"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34888,7 +34888,7 @@
       carrier_id = "2202"
       mcc="634"
       mnc="07"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34896,7 +34896,7 @@
       carrier_id = "2242"
       mcc="634"
       mnc="09"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34904,7 +34904,7 @@
       carrier_id = "1682"
       mcc="635"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34912,7 +34912,7 @@
       carrier_id = "2243"
       mcc="635"
       mnc="12"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34920,7 +34920,7 @@
       carrier_id = "2203"
       mcc="635"
       mnc="13"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34928,7 +34928,7 @@
       carrier_id = "2204"
       mcc="635"
       mnc="14"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34936,7 +34936,7 @@
       carrier_id = "681"
       mcc="636"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34944,7 +34944,7 @@
       carrier_id = "2205"
       mcc="637"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34952,7 +34952,7 @@
       carrier_id = "2244"
       mcc="637"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34960,7 +34960,7 @@
       carrier_id = "2206"
       mcc="637"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34968,7 +34968,7 @@
       carrier_id = "2245"
       mcc="637"
       mnc="25"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34976,7 +34976,7 @@
       carrier_id = "1082"
       mcc="637"
       mnc="30"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -34984,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"
   />
 
@@ -34999,7 +34999,7 @@
       carrier_id = "2207"
       mcc="637"
       mnc="71"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35007,7 +35007,7 @@
       carrier_id = "2208"
       mcc="637"
       mnc="82"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35015,7 +35015,7 @@
       carrier_id = "1462"
       mcc="638"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35238,7 +35238,7 @@
       carrier_id = "1373"
       mcc="642"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35246,7 +35246,7 @@
       carrier_id = "1374"
       mcc="642"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35254,7 +35254,7 @@
       carrier_id = "1375"
       mcc="642"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35262,7 +35262,7 @@
       carrier_id = "2355"
       mcc="642"
       mnc="07"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35270,7 +35270,7 @@
       carrier_id = "2211"
       mcc="642"
       mnc="08"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35278,7 +35278,7 @@
       carrier_id = "2212"
       mcc="642"
       mnc="82"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35286,7 +35286,7 @@
       carrier_id = "1634"
       mcc="643"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35294,7 +35294,7 @@
       carrier_id = "2213"
       mcc="643"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35302,7 +35302,7 @@
       carrier_id = "2381"
       mcc="643"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35310,7 +35310,7 @@
       carrier_id = "1319"
       mcc="645"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35318,7 +35318,7 @@
       carrier_id = "1320"
       mcc="645"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35326,7 +35326,7 @@
       carrier_id = "1321"
       mcc="645"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35493,7 +35493,7 @@
       carrier_id = "1879"
       mcc="648"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35501,7 +35501,7 @@
       carrier_id = "1880"
       mcc="648"
       mnc="04"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35509,7 +35509,7 @@
       carrier_id = "941"
       mcc="649"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35517,7 +35517,7 @@
       carrier_id = "2214"
       mcc="649"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35525,7 +35525,7 @@
       carrier_id = "942"
       mcc="649"
       mnc="03"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35533,7 +35533,7 @@
       carrier_id = "1625"
       mcc="650"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35541,7 +35541,7 @@
       carrier_id = "1626"
       mcc="650"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35589,7 +35589,7 @@
       carrier_id = "1091"
       mcc="653"
       mnc="10"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35597,7 +35597,7 @@
       carrier_id = "872"
       mcc="654"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35770,7 +35770,7 @@
       carrier_id = "2247"
       mcc="657"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35778,7 +35778,7 @@
       carrier_id = "570"
       mcc="702"
       mnc="67"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -35786,7 +35786,7 @@
       carrier_id = "2354"
       mcc="702"
       mnc="99"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -38204,7 +38204,7 @@
       carrier_id = "1525"
       mcc="738"
       mnc="01"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -38240,7 +38240,7 @@
       carrier_id = "2217"
       mcc="738"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -38444,7 +38444,7 @@
       carrier_id = "1083"
       mcc="746"
       mnc="02"
-      apn="default,ia"
+      apn="default"
       type="default,ia,supl"
   />
 
@@ -38602,7 +38602,7 @@
       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"