Merge "APN Bug - Modify/Add APN Configuration for KOODO - 352352887" into main
diff --git a/etc/Android.bp b/etc/Android.bp
new file mode 100644
index 0000000..62c04ed
--- /dev/null
+++ b/etc/Android.bp
@@ -0,0 +1,7 @@
+prebuilt_etc {
+    name: "apns-full-conf.xml",
+    src: "apns-full-conf.xml",
+    filename: "apns-conf.xml",
+    product_specific: true,
+    no_full_install: true,
+}
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 3bedbae..c1afe84 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -823,6 +823,23 @@
       roaming_protocol="IPV4V6"
   />
 
+ <apn carrier="Tata Move"
+      mcc="204"
+      mnc="07"
+      apn="move.dataxs.mobi"
+      type="default,supl,dun"
+  />
+
+ <apn carrier="IMS"
+      mcc="204"
+      mnc="07"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
   <apn carrier="KPN Mobiel Internet"
       carrier_id = "1644"
       mcc="204"
@@ -913,7 +930,7 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="KPN Mobiel Internet"
+  <apn carrier="Telfort Mobiel Internet"
       carrier_id = "1644"
       mcc="204"
       mnc="12"
@@ -1509,15 +1526,6 @@
       user_visible="false"
   />
 
-  <apn carrier="Orange Entreprises"
-      carrier_id = "32"
-      mcc="208"
-      mnc="01"
-      apn="orange-mib"
-      type="default,ia,supl"
-      user_editable="false"
-  />
-
   <apn carrier="Orange MCX"
       carrier_id="32"
       mcc="208"
@@ -2431,7 +2439,7 @@
       authtype="1"
       mvno_type="spn"
       mvno_match_data="Orange"
-      type="default"
+      type="default,supl,ia"
       user_editable="false"
   />
 
@@ -2617,17 +2625,18 @@
       mvno_match_data="JAZZTEL"
   />
 
-  <apn carrier="jazzinternet"
+  <apn carrier="JAZZTEL internet"
       carrier_id = "1974"
       mcc="214"
       mnc="03"
       apn="jazzinternet"
       mvno_type="spn"
       mvno_match_data="JAZZTEL"
-      type="default,supl,dun"
+      type="default,supl,dun,ia"
+      user_editable="false"
   />
 
-  <apn carrier="MMS"
+  <apn carrier="JAZZTEL MMS"
       carrier_id = "1974"
       mcc="214"
       mnc="03"
@@ -2641,6 +2650,7 @@
       mvno_type="spn"
       mvno_match_data="JAZZTEL"
       type="mms"
+      user_editable="false"
   />
 
   <apn carrier="JAZZTEL IMS"
@@ -2677,7 +2687,8 @@
       password = "orange"
       mvno_type="spn"
       mvno_match_data="simyo"
-      type="default,supl,dun"
+      type="default,supl,dun,ia"
+      user_editable="false"
   />
 
   <apn carrier="simyo MMS"
@@ -2694,6 +2705,7 @@
       mvno_type="spn"
       mvno_match_data="simyo"
       type="mms"
+      user_editable="false"
   />
 
   <apn carrier="simyo IMS"
@@ -3168,6 +3180,7 @@
       type="default,ia,supl,dun"
       mvno_type="spn"
       mvno_match_data="simyo"
+      user_editable="false"
     />
 
   <apn carrier="simyo MMS"
@@ -3176,12 +3189,15 @@
       mnc="19"
       apn="orangemms"
       authtype="1"
+      user="orange"
+      password="orange"
       mmsc="http://mms.orange.es"
       mmsproxy="172.22.188.25"
       mmsport="8080"
       type="mms"
       mvno_type="spn"
       mvno_match_data="simyo"
+      user_editable="false"
   />
 
   <apn carrier="jazzinternet"
@@ -5687,6 +5703,23 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="Tata Move UK"
+      mcc="234"
+      mnc="27"
+      apn="move.dataxs.mobi"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="IMS"
+      mcc="234"
+      mnc="27"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
   <apn carrier="EE Internet"
       carrier_id = "718"
       mcc="234"
@@ -29371,6 +29404,21 @@
       type="mms"
   />
 
+  <apn carrier="Rcell IMS"
+      carrier_id = "2646"
+      mcc="417"
+      mnc="50"
+      apn="ims"
+      type="ims"
+  />
+   <apn carrier="Rcell Internet"
+      carrier_id = "2646"
+      mcc="417"
+      mnc="50"
+      apn="internet"
+      type="default"
+  />
+
   <apn carrier="Asiacell Internet"
       carrier_id = "1969"
       mcc="418"
@@ -29923,12 +29971,10 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Jawwal WAP"
+  <apn carrier="Jawwal internet"
       mcc="425"
       mnc="05"
-      apn="wap"
-      proxy="213.244.118.129"
-      port="8080"
+      apn="internet"
       type="default,ia,supl"
   />
 
@@ -30297,7 +30343,7 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="shatelmonile"
+  <apn carrier="shatelmobile"
      mcc="432"
      mnc="08"
      apn="shatelmobile"
@@ -30306,7 +30352,7 @@
      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="shatelmonile"
+  <apn carrier="shatelmobile"
      mcc="432"
      mnc="08"
      apn="SHM-IMS"
@@ -34086,23 +34132,35 @@
       roaming_protocol="IP"
   />
 
-  <apn carrier="VF AU PXT"
+  <apn carrier="Pivotel MMS"
       carrier_id = "492"
       mcc="505"
       mnc="88"
-      apn="live.vodafone.com"
-      mmsc="http://pxt.vodafone.net.au/pxtsend"
-      mmsproxy="10.202.2.60"
-      mmsport="8080"
+      apn="mms"
+      mmsc="http://mmsc.pivotel.com.au:8002"
+      mmsproxy="203.105.216.88"
+      mmsport="8088"
       type="mms"
   />
 
-  <apn carrier="VF Internet"
+  <apn carrier="Pivotel Internet"
       carrier_id = "492"
       mcc="505"
       mnc="88"
-      apn="vfinternet.au"
+      apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Pivotel IMS"
+      carrier_id = "492"
+      mcc="505"
+      mnc="88"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Optus Internet"
@@ -39746,6 +39804,23 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="Tata Move IOT"
+      mcc="901"
+      mnc="54"
+      apn="move.dataxs.mobi"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="IMS"
+      mcc="901"
+      mnc="54"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
   <apn carrier="BICS Internet"
       carrier_id = "2132"
       mcc="901"