Merge "Remove obsolete Orange Carabe WAP APN" am: 8ac4e70d7b am: 61d0440807
am: b874ff3da0

Change-Id: I4b798f23ce3ec98487dd8bcbe06ffed941b12db2
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
old mode 100755
new mode 100644
index 3c75809..6e39988
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -6169,6 +6169,15 @@
       mvno_type="imsi"
   />
 
+  <apn carrier="O2 DE IMS"
+      mcc="262"
+      mnc="07"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="o2 Internet Prepaid"
       mcc="262"
       mnc="07"
@@ -6229,6 +6238,15 @@
       mvno_type="imsi"
   />
 
+  <apn carrier="O2 DE IMS"
+      mcc="262"
+      mnc="08"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Truphone"
       mcc="262"
       mnc="42"
@@ -6987,6 +7005,49 @@
       mvno_type="gid"
   />
 
+  <apn carrier="TELUS"
+      mcc="302"
+      mnc="220"
+      apn="sp.telus.com"
+      type="default,mms,supl"
+      mmsc="http://aliasredirect.net/proxy/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="55"
+      mvno_type="gid"
+  />
+
+  <apn carrier="TELUS Tether"
+      mcc="302"
+      mnc="220"
+      apn="isp.telus.com"
+      server="*"
+      type="dun"
+      protocol="IPV4V6"
+      mvno_match_data="54"
+      mvno_type="gid"
+  />
+
+  <apn carrier="TELUS Tether"
+      mcc="302"
+      mnc="220"
+      apn="isp.telus.com"
+      server="*"
+      type="dun"
+      protocol="IPV4V6"
+      mvno_match_data="55"
+      mvno_type="gid"
+  />
+
+  <apn carrier="TELUS IMS"
+      mcc="302"
+      mnc="220"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Koodo"
       mcc="302"
       mnc="220"
@@ -6999,6 +7060,40 @@
       mvno_type="gid"
   />
 
+  <apn carrier="Koodo"
+      mcc="302"
+      mnc="220"
+      apn="sp.koodo.com"
+      type="default,mms,supl"
+      mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="4F"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Koodo Tether"
+      mcc="302"
+      mnc="220"
+      apn="sp.koodo.com"
+      server="*"
+      type="dun"
+      protocol="IPV4V6"
+      mvno_match_data="4B"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Koodo Tether"
+      mcc="302"
+      mnc="220"
+      apn="sp.koodo.com"
+      server="*"
+      type="dun"
+      protocol="IPV4V6"
+      mvno_match_data="4F"
+      mvno_type="gid"
+  />
+
   <apn carrier="Mobile Internet"
       mcc="302"
       mnc="220"
@@ -7062,6 +7157,49 @@
       mvno_type="gid"
   />
 
+  <apn carrier="TELUS"
+      mcc="302"
+      mnc="221"
+      apn="sp.telus.com"
+      type="default,mms,supl"
+      mmsc="http://aliasredirect.net/proxy/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="55"
+      mvno_type="gid"
+  />
+
+  <apn carrier="TELUS Tether"
+      mcc="302"
+      mnc="221"
+      apn="isp.telus.com"
+      server="*"
+      type="dun"
+      protocol="IPV4V6"
+      mvno_match_data="54"
+      mvno_type="gid"
+  />
+
+  <apn carrier="TELUS Tether"
+      mcc="302"
+      mnc="221"
+      apn="isp.telus.com"
+      server="*"
+      type="dun"
+      protocol="IPV4V6"
+      mvno_match_data="55"
+      mvno_type="gid"
+  />
+
+  <apn carrier="TELUS IMS"
+      mcc="302"
+      mnc="221"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Koodo"
       mcc="302"
       mnc="221"
@@ -7074,6 +7212,40 @@
       mvno_type="gid"
   />
 
+  <apn carrier="Koodo"
+      mcc="302"
+      mnc="221"
+      apn="sp.koodo.com"
+      type="default,mms,supl"
+      mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="4F"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Koodo Tether"
+      mcc="302"
+      mnc="221"
+      apn="sp.koodo.com"
+      server="*"
+      type="dun"
+      protocol="IPV4V6"
+      mvno_match_data="4B"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Koodo Tether"
+      mcc="302"
+      mnc="221"
+      apn="sp.koodo.com"
+      server="*"
+      type="dun"
+      protocol="IPV4V6"
+      mvno_match_data="4F"
+      mvno_type="gid"
+  />
+
   <apn carrier="PC mobile"
       mcc="302"
       mnc="221"
@@ -7122,6 +7294,15 @@
       type="default,supl"
   />
 
+  <apn carrier="Rogers IMS"
+      mcc="302"
+      mnc="370"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Fido Tethering"
       mcc="302"
       mnc="370"
@@ -7147,6 +7328,17 @@
       roaming_protocol="IP"
   />
 
+  <apn carrier="Fido Internet"
+      mcc="302"
+      mnc="370"
+      apn="IMS"
+      type="ims"
+      mvno_match_data="DD"
+      mvno_type="gid"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="MTS"
       mcc="302"
       mnc="370"
@@ -7222,6 +7414,15 @@
       mmsc="http://mms.bell.ca/mms/wapenc"
   />
 
+  <apn carrier="Bell Mobility IMS"
+      mcc="302"
+      mnc="610"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="MTS"
       mcc="302"
       mnc="660"
@@ -7247,6 +7448,27 @@
       mvno_match_data="MTS"
   />
 
+  <apn carrier="Rogers LTE"
+      mcc="302"
+      mnc="720"
+      apn="ltemobile.apn"
+      type="default,mms,supl"
+      mmsproxy="mmsproxy.rogers.com"
+      mmsc="http://mms.gprs.rogers.com"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Rogers IMS"
+      mcc="302"
+      mnc="720"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="chatr"
       mcc="302"
       mnc="720"
@@ -26183,6 +26405,15 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Telstra IMS"
+      mcc="505"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Telstra Internet"
       mcc="505"
       mnc="01"