commit a487fc4f3d2f0d1a060a5aae2f06124a83efa3e7
author Junda Liu <junda@google.com> Thu Jan 05 10:40:59 2017 -0800
committer Junda Liu <junda@google.com> Thu Jan 05 10:56:09 2017 -0800
tree 7e8aa74e68cf5a16082d4d66ca3e67605465c898
parent 06afb535d9144823740c86a78a26c4f351c3b51e

Fix incorrect gid for Telus or Koodo.

GID value isn't set correct for Telus or Koodo APN.
Also remove dun apn from the conf file.

Bug: b/34036790
Change-Id: I27f62c618d8a9756f43bfd4b6cc5d90f5ec13d8a

apns-full-conf.xml

diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 338b3b3..203f7ec 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -6881,32 +6881,7 @@
       mmsport="8799"
       protocol="IPV6"
       roaming_protocol="IP"
-      mvno_match_data="54"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS SP"
-      mcc="302"
-      mnc="220"
-      apn="sp.telus.com"
-      type="default,mms,supl,hipri,ia"
-      mmsc="http://aliasredirect.net/proxy/mmsc"
-      mmsproxy="mmscproxy.mobility.ca"
-      mmsport="8799"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mvno_match_data="55"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS ISP"
-      mcc="302"
-      mnc="220"
-      apn="isp.telus.com"
-      server="*"
-      type="dun"
-      protocol="IP"
-      mvno_match_data="54"
+      mvno_match_data="5455"
       mvno_type="gid"
   />
 
@@ -6916,28 +6891,7 @@
       apn="ims"
       type="ims"
       protocol="IPV6"
-      mvno_match_data="54"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS IMS"
-      mcc="302"
-      mnc="220"
-      apn="ims"
-      type="ims"
-      protocol="IPV6"
-      mvno_match_data="55"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS ISP"
-      mcc="302"
-      mnc="220"
-      apn="isp.telus.com"
-      server="*"
-      type="dun"
-      protocol="IP"
-      mvno_match_data="55"
+      mvno_match_data="5455"
       mvno_type="gid"
   />
 
@@ -6951,21 +6905,7 @@
       mmsport="80"
       protocol="IP"
       roaming_protocol="IP"
-      mvno_match_data="4B"
-      mvno_type="gid"
-  />
-
-  <apn carrier="Koodo SP"
-      mcc="302"
-      mnc="220"
-      apn="sp.koodo.com"
-      type="*"
-      mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      protocol="IP"
-      roaming_protocol="IP"
-      mvno_match_data="4F"
+      mvno_match_data="4B4F"
       mvno_type="gid"
   />
 
@@ -6975,17 +6915,7 @@
       apn="ims"
       type="ims"
       protocol="IPV6"
-      mvno_match_data="4B"
-      mvno_type="gid"
-  />
-
-  <apn carrier="Koodo IMS"
-      mcc="302"
-      mnc="220"
-      apn="ims"
-      type="ims"
-      protocol="IPV6"
-      mvno_match_data="4F"
+      mvno_match_data="4B4F"
       mvno_type="gid"
   />
 
@@ -6997,7 +6927,7 @@
       mmsc="http://aliasredirect.net/proxy/mb/mmsc"
       mmsproxy="74.49.0.18"
       mmsport="80"
-      mvno_match_data="50"
+      mvno_match_data="5043"
       mvno_type="gid"
   />
 
@@ -7023,32 +6953,7 @@
       mmsport="8799"
       protocol="IPV6"
       roaming_protocol="IP"
-      mvno_match_data="54"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS SP"
-      mcc="302"
-      mnc="221"
-      apn="sp.telus.com"
-      type="default,mms,supl,hipri,ia"
-      mmsc="http://aliasredirect.net/proxy/mmsc"
-      mmsproxy="mmscproxy.mobility.ca"
-      mmsport="8799"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      mvno_match_data="55"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS ISP"
-      mcc="302"
-      mnc="221"
-      apn="isp.telus.com"
-      server="*"
-      type="dun"
-      protocol="IP"
-      mvno_match_data="54"
+      mvno_match_data="5455"
       mvno_type="gid"
   />
 
@@ -7058,28 +6963,7 @@
       apn="ims"
       type="ims"
       protocol="IPV6"
-      mvno_match_data="54"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS IMS"
-      mcc="302"
-      mnc="221"
-      apn="ims"
-      type="ims"
-      protocol="IPV6"
-      mvno_match_data="55"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS ISP"
-      mcc="302"
-      mnc="221"
-      apn="isp.telus.com"
-      server="*"
-      type="dun"
-      protocol="IP"
-      mvno_match_data="55"
+      mvno_match_data="5455"
       mvno_type="gid"
   />
 
@@ -7093,21 +6977,7 @@
       mmsport="80"
       protocol="IP"
       roaming_protocol="IP"
-      mvno_match_data="4B"
-      mvno_type="gid"
-  />
-
-  <apn carrier="Koodo SP"
-      mcc="302"
-      mnc="221"
-      apn="sp.koodo.com"
-      type="*"
-      mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      protocol="IP"
-      roaming_protocol="IP"
-      mvno_match_data="4F"
+      mvno_match_data="4B4F"
       mvno_type="gid"
   />
 
@@ -7117,17 +6987,7 @@
       apn="ims"
       type="ims"
       protocol="IPV6"
-      mvno_match_data="4B"
-      mvno_type="gid"
-  />
-
-  <apn carrier="Koodo IMS"
-      mcc="302"
-      mnc="221"
-      apn="ims"
-      type="ims"
-      protocol="IPV6"
-      mvno_match_data="4F"
+      mvno_match_data="4B4F"
       mvno_type="gid"
   />
 
@@ -7139,7 +6999,7 @@
       mmsc="http://aliasredirect.net/proxy/mb/mmsc"
       mmsproxy="74.49.0.18"
       mmsport="80"
-      mvno_match_data="50"
+      mvno_match_data="5043"
       mvno_type="gid"
   />