commit 1646b066572cd414e39466b1fbb00092cf53a96b
author Garett Beukeboom <garett.beukeboom@telus.com> Tue Apr 24 15:26:14 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 24 15:26:14 2018 -0700
tree 99b37ecdc6663e32e60186c0233c6d823937ad22
parent fbc91f7deefd826cf2800201c4c2415b343a987c
parent e5b31c1e83526684ea2ec1606095246cd44cde01

Merge "Updated TELUS and related MVNO APN settings" am: 688d345ade
am: e5b31c1e83

Change-Id: Id9e869c2d97b4a55431d769e0628bc17ab7a2020

etc/apns-full-conf.xml

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 7d78d2d..9ac21f7 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -6969,21 +6969,9 @@
       apn="sp.telus.com"
       type="default,mms,supl"
       mmsc="http://aliasredirect.net/proxy/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      mvno_match_data="54"
-      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"
+      mmsproxy="mmscproxy.mobility.ca"
+      mmsport="8799"
+      mvno_match_data="5455"
       mvno_type="gid"
   />
 
@@ -6993,40 +6981,8 @@
       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"
-      apn="sp.koodo.com"
-      type="default,mms,supl,dun"
-      mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      mvno_match_data="4B"
+      protocol="IPV4"
+      mvno_match_data="5455"
       mvno_type="gid"
   />
 
@@ -7036,9 +6992,9 @@
       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"
+      mmsproxy="mmscproxy.mobility.ca"
+      mmsport="8799"
+      mvno_match_data="4B4F"
       mvno_type="gid"
   />
 
@@ -7048,19 +7004,8 @@
       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"
+      protocol="IPV4"
+      mvno_match_data="4B4F"
       mvno_type="gid"
   />
 
@@ -7070,9 +7015,9 @@
       apn="sp.mb.com"
       type="default,mms,supl"
       mmsc="http://aliasredirect.net/proxy/mb/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      mvno_match_data="50"
+      mmsproxy="mmscproxy.mobility.ca"
+      mmsport="8799"
+      mvno_match_data="5043"
       mvno_type="gid"
   />
 
@@ -7081,151 +7026,31 @@
       mnc="220"
       apn="isp.mb.com"
       type="dun"
+      protocol="IPV4"
       mvno_type="gid"
-      mvno_match_data="50"
+      mvno_match_data="5043"
   />
 
   <apn carrier="Mobile Internet"
-       mcc="302"
-       mnc="220"
-       apn="sp.mb.com"
-       type="default,mms,agps,supl,fota,hipri"
-       mmsc="http://aliasredirect.net/proxy/mb/mmsc"
-       mmsproxy="74.49.0.18"
-       mmsport="80"
-       mvno_type="gid"
-       mvno_match_data="4D4F"
-  />
-
-  <apn carrier="Tethered Mobile Internet"
       mcc="302"
       mnc="220"
-      apn="isp.mb.com"
-      type="dun"
+      apn="sp.mb.com"
+      type="default,mms,agps,supl,fota,hipri"
+      mmsc="http://aliasredirect.net/proxy/mb/mmsc"
+      mmsproxy="mmscproxy.mobility.ca"
+      mmsport="8799"
       mvno_type="gid"
       mvno_match_data="4D4F"
   />
 
-  <apn carrier="TELUS ISP"
+  <apn carrier="Tethered Mobile Internet"
       mcc="302"
       mnc="220"
-      apn="isp.telus.com"
+      apn="isp.mb.com"
       type="dun"
+      protocol="IPV4"
       mvno_type="gid"
-      mvno_match_data="54"
-  />
-
-  <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="54"
-      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"
-      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="4B"
-      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"
-      apn="sp.mb.com"
-      type="default,mms,supl"
-      mmsc="http://aliasredirect.net/proxy/mb/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      mvno_match_data="50"
-      mvno_type="gid"
+      mvno_match_data="4D4F"
   />
 
   <apn carrier="MOWAP"