Update Canada APNs mcc302

With historical data from Sony changes. Both country specific
and roaming APNs where updated.

Updates to operators Videotron, Bell, Lucky, Tbaytel, Cityfone,
, Ztar, SaskTel and Rogers.

Removed WIND Mobile, the company bought and renamed to Freedom Mobile.
Removed Dave Wireless, it was discontinued 2016.
Removed MTS, it was acquired by Bell 2017.

Updated Chatr APN for mcc302 mnc320 with information
from https://www.chatrwireless.com

Removed protocol set to default IP from APNs.

Test: adb shell content query --uri content://telephony/carriers --where mcc='302'
Bug: 202924232
Change-Id: I8c1d27d3d4ac80dfc7d37fa0b1f1e4070d512a30
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 1d54217..6790f83 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -659,6 +659,20 @@
       protocol="IPV4V6"
   />
 
+  <apn carrier="SaskTel Internet"
+      carrier_id = "580"
+      mcc="204"
+      mnc="04"
+      apn="pda.stm.sk.ca"
+      mmsc="http://mms.sasktel.com/"
+      mmsproxy="mig.sasktel.com"
+      mmsport="80"
+      type="default,ia,mms,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="5A"
+  />
+
   <apn carrier="HOT mobile Internet"
       carrier_id = "1991"
       mcc="204"
@@ -3393,19 +3407,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="SaskTel"
-      carrier_id = "580"
-      mcc="204"
-      mnc="04"
-      apn="pda.stm.sk.ca"
-      type="default,ia,mms,supl"
-      mmsc="http://mms.sasktel.com/"
-      mmsproxy="mig.sasktel.com"
-      mmsport="80"
-      mvno_match_data="5A"
-      mvno_type="gid"
-  />
-
   <apn carrier="agms"
       carrier_id = "2351"
       mcc="204"
@@ -3480,30 +3481,6 @@
       user_visible="false"
   />
 
-  <apn carrier="Internet"
-      carrier_id = "1895"
-      mcc="222"
-      mnc="01"
-      apn="internet.windmobile.ca"
-      type="default,ia,supl"
-      protocol="IPV4V6"
-      mvno_match_data="FFFFFF00"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MMS"
-      carrier_id = "1895"
-      mcc="222"
-      mnc="01"
-      apn="mms.windmobile.ca"
-      mmsc="http://mms.windmobile.ca"
-      mmsproxy="74.115.197.70"
-      mmsport="8080"
-      type="mms"
-      mvno_match_data="FFFFFF00"
-      mvno_type="gid"
-  />
-
  <apn carrier="MMS"
       carrier_id = "1912"
       mcc="222"
@@ -3833,30 +3810,6 @@
       type="mms"
   />
 
-  <apn carrier="Internet"
-      carrier_id = "1895"
-      mcc="222"
-      mnc="88"
-      apn="internet.windmobile.ca"
-      type="default,ia,supl"
-      protocol="IPV4V6"
-      mvno_match_data="FFFFFF00"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MMS"
-      carrier_id = "1895"
-      mcc="222"
-      mnc="88"
-      apn="mms.windmobile.ca"
-      mmsc="http://mms.windmobile.ca"
-      mmsproxy="74.115.197.70"
-      mmsport="8080"
-      type="mms"
-      mvno_match_data="FFFFFF00"
-      mvno_type="gid"
-  />
-
   <apn carrier="INTERNET"
       carrier_id = "1575"
       mcc="222"
@@ -8835,7 +8788,6 @@
       apn="isp.telus.com"
       server="*"
       type="dun"
-      protocol="IP"
       mvno_match_data="5455"
       mvno_type="gid"
   />
@@ -8860,7 +8812,6 @@
       apn="sp.koodo.com"
       server="*"
       type="dun"
-      protocol="IP"
       mvno_match_data="4B4F"
       mvno_type="gid"
   />
@@ -8884,7 +8835,6 @@
       mnc="220"
       apn="isp.mb.com"
       type="dun"
-      protocol="IP"
       mvno_type="gid"
       mvno_match_data="5043"
   />
@@ -8908,7 +8858,6 @@
       mnc="220"
       apn="isp.mb.com"
       type="dun"
-      protocol="IP"
       mvno_type="gid"
       mvno_match_data="4D4F"
   />
@@ -8920,7 +8869,6 @@
       apn="isp.telus.com"
       server="*"
       type="dun"
-      protocol="IP"
       mvno_match_data="5455"
       mvno_type="gid"
   />
@@ -8932,7 +8880,6 @@
       apn="sp.koodo.com"
       server="*"
       type="dun"
-      protocol="IP"
       mvno_match_data="4B4F"
       mvno_type="gid"
   />
@@ -8943,33 +8890,11 @@
       mnc="221"
       apn="isp.mb.com"
       type="dun"
-      protocol="IP"
       mvno_type="gid"
       mvno_match_data="5043"
   />
 
-  <apn carrier="MOWAP"
-      carrier_id = "2055"
-      mcc="302"
-      mnc="320"
-      apn="wap.davewireless.com"
-      proxy="10.100.3.4"
-      port="8080"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="MOMMS"
-      carrier_id = "2055"
-      mcc="302"
-      mnc="320"
-      apn="mms.davewireless.com"
-      mmsc="http://mms.mobilicity.net"
-      mmsproxy="10.100.3.4"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="MMS"
+  <apn carrier="Eastlink MMS"
       carrier_id = "2252"
       mcc="302"
       mnc="270"
@@ -8978,14 +8903,29 @@
       mmsproxy="10.232.12.49"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Eastlink Internet"
       carrier_id = "2252"
       mcc="302"
       mnc="270"
       apn="wisp.mobi.eastlink.ca"
       type="default,ia,supl"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="Chatr Internet"
+      carrier_id = "2055"
+      mcc="302"
+      mnc="320"
+      apn="chatrweb.apn"
+      type="default,ia,mms,supl"
+      mmsc="http://mms.chatrwireless.com"
+      mmsproxy="mmsproxy.chatrwireless.com"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Rogers IMS"
@@ -9007,7 +8947,6 @@
       mvno_match_data="DD"
       mvno_type="gid"
       protocol="IPV4V6"
-      roaming_protocol="IP"
   />
 
   <apn carrier="Fido Internet"
@@ -9022,7 +8961,6 @@
       mvno_match_data="DD"
       mvno_type="gid"
       protocol="IPV4V6"
-      roaming_protocol="IP"
   />
 
   <apn carrier="Fido Internet"
@@ -9037,38 +8975,11 @@
       roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="MTS"
-      carrier_id = "578"
-      mcc="302"
-      mnc="370"
-      apn="sp.mts"
-      type="default,ia,mms,supl"
-      mmsc="http://mmsc2.mts.net/"
-      mmsproxy="wapgw1.mts.net"
-      mmsport="9201"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="2C"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MTS Tethering S"
-      carrier_id = "578"
-      mcc="302"
-      mnc="370"
-      apn="internet.mts"
-      type="dun"
-      protocol="IPV4V6"
-      roaming_protocol="IP"
-      mvno_type="gid"
-      mvno_match_data="2C"
-  />
-
   <apn carrier="Internet"
       carrier_id = "1895"
       mcc="302"
       mnc="490"
-      apn="internet.windmobile.ca"
+      apn="internet.freedommobile.ca"
       type="default,ia,supl"
       protocol="IPV4V6"
   />
@@ -9077,8 +8988,8 @@
       carrier_id = "1895"
       mcc="302"
       mnc="490"
-      apn="mms.windmobile.ca"
-      mmsc="http://mms.windmobile.ca"
+      apn="mms.freedommobile.ca"
+      mmsc="http://mms.freedommobile.ca"
       mmsproxy="74.115.197.70"
       mmsport="8080"
       type="mms"
@@ -9090,34 +9001,19 @@
       mnc="500"
       apn="media.ng"
       mmsc="http://media.videotron.com"
+      authtype="1"
       type="default,ia,supl,mms"
   />
 
-  <apn carrier="Media"
-      carrier_id = "2008"
-      mcc="302"
-      mnc="510"
-      apn="media.ng"
-      mmsc="http://media.videotron.com"
-      type="default,ia,supl,mms"
-  />
-
-  <apn carrier="Media"
-      carrier_id = "2008"
-      mcc="302"
-      mnc="520"
-      apn="media.ng"
-      mmsc="http://media.videotron.com"
-      type="default,ia,supl,mms"
-  />
-
-  <apn carrier="Bell Mobility"
+  <apn carrier="Bell Internet"
       carrier_id = "576"
       mcc="302"
       mnc="610"
       apn="pda.bell.ca"
       type="default,ia,mms,supl"
+      authtype="2"
       mmsc="http://mms.bell.ca/mms/wapenc"
+      protocol="IPV4V6"
   />
 
   <apn carrier="Bell Mobility IMS"
@@ -9130,18 +9026,26 @@
       roaming_protocol="IPV4V6"
   />
 
+  <apn carrier="Lucky Internet"
+      carrier_id = "2122"
+      mcc="302"
+      mnc="610"
+      apn="pda.bell.ca"
+      type="default,ia,mms,supl"
+      authtype="2"
+      mmsc="http://mms.luckymobile.ca/mms/wapenc"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="42"
+  />
+
   <apn carrier="MTS"
       mcc="302"
       mnc="660"
       apn="sp.mts"
       type="default,ia,mms,supl"
       mmsc="http://mmsc2.mts.net/"
-      mmsproxy="wapgw1.mts.net"
-      mmsport="9201"
       protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_type="spn"
-      mvno_match_data="MTS"
   />
 
   <apn carrier="MTS Tethering"
@@ -9150,7 +9054,6 @@
       apn="internet.mts"
       type="dun"
       protocol="IPV4V6"
-      roaming_protocol="IP"
       mvno_type="spn"
       mvno_match_data="MTS"
   />
@@ -9178,21 +9081,34 @@
       roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="chatr"
+  <apn carrier="Chatr Internet"
       carrier_id = "2055"
       mcc="302"
       mnc="720"
       apn="chatrweb.apn"
       type="default,ia,mms,supl"
       mmsc="http://mms.chatrwireless.com"
-      mmsproxy="205.151.11.11"
+      mmsproxy="mmsproxy.chatrwireless.com"
       mmsport="80"
-      proxy="205.151.11.11"
-      port="80"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      mvno_match_data="302720x94"
       mvno_type="imsi"
+      mvno_match_data="302720x94"
+  />
+
+  <apn carrier="Chatr Internet"
+      carrier_id = "2055"
+      mcc="302"
+      mnc="720"
+      apn="chatrweb.apn"
+      type="default,ia,mms,supl"
+      mmsc="http://mms.chatrwireless.com"
+      mmsproxy="mmsproxy.chatrwireless.com"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="D2"
   />
 
   <apn carrier="Chatr Tethering"
@@ -9204,7 +9120,7 @@
       mvno_type="imsi"
       mvno_match_data="302720x94"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Tbaytel Tethering"
@@ -9214,19 +9130,31 @@
       apn="ltedata.apn"
       type="dun"
       protocol="IPV4V6"
-      roaming_protocol="IP"
       mvno_type="gid"
       mvno_match_data="BA"
   />
 
   <apn carrier="Tbaytel Internet"
-      mnc="720"
       carrier_id = "2090"
       mcc="302"
+      mnc="720"
       apn="ltemobile.apn"
-      type="default,ia,mms,supl,fota,hipri"
+      type="default,ia,mms,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      mmsc="http://mms.gprs.rogers.com"
+      mmsproxy="mmsproxy.rogers.com"
+      mmsport="80"
+      mvno_type="imsi"
+      mvno_match_data="302720x92"
+  />
+
+  <apn carrier="Tbaytel Internet"
+      carrier_id = "2090"
+      mcc="302"
+      mnc="720"
+      apn="ltemobile.apn"
+      type="default,ia,mms,supl"
+      protocol="IPV4V6"
       mmsc="http://mms.gprs.rogers.com"
       mmsproxy="mmsproxy.rogers.com"
       mmsport="80"
@@ -9241,52 +9169,65 @@
       apn="ltedata.apn"
       type="dun"
       protocol="IPV4V6"
-      roaming_protocol="IP"
       mvno_type="spn"
       mvno_match_data="CITYFONE"
   />
 
   <apn carrier="Cityfone Internet"
-      mnc="720"
       carrier_id = "2057"
       mcc="302"
+      mnc="720"
       apn="ltemobile.apn"
-      type="default,ia,mms,supl,fota,hipri"
+      type="default,ia,mms,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
       mmsc="http://mms.gprs.rogers.com"
       mmsproxy="mmsproxy.rogers.com"
       mmsport="80"
-      mvno_type="spn"
-      mvno_match_data="CITYFONE"
+      mvno_type="imsi"
+      mvno_match_data="302720x97"
   />
 
-  <apn carrier="Rogers Tethering"
-      mcc="302"
-      mnc="720"
-      apn="ltedata.apn"
-      type="dun"
-      mvno_match_data="ROGERS"
-      mvno_type="spn"
-      protocol="IPV4V6"
-      roaming_protocol="IP"
-  />
-
-  <apn carrier="Rogers Internet"
+  <apn carrier="Cityfone Internet"
+      carrier_id = "2057"
       mcc="302"
       mnc="720"
       apn="ltemobile.apn"
-      type="default,ia,mms,supl,fota,hipri"
-      mmsproxy="mmsproxy.rogers.com"
-      mmsc="http://mms.gprs.rogers.com"
-      mmsport="80"
-      mvno_match_data="ROGERS"
-      mvno_type="spn"
+      type="default,ia,mms,supl"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      mmsc="http://mms.gprs.rogers.com"
+      mmsproxy="mmsproxy.rogers.com"
+      mmsport="80"
+      mvno_type="gid"
+      mvno_match_data="CC"
   />
 
-  <apn carrier="SaskTel"
+  <apn carrier="Ztar Internet"
+      carrier_id = "2056"
+      mcc="302"
+      mnc="720"
+      apn="rogers-core-appl1.apn"
+      type="default,ia,mms,supl"
+      mmsc="http://mms.gprs.rogers.com"
+      mmsproxy="mmsproxy.rogers.com"
+      mmsport="80"
+      mvno_type="imsi"
+      mvno_match_data="302720x98"
+  />
+
+  <apn carrier="Ztar Internet"
+      carrier_id = "2056"
+      mcc="302"
+      mnc="720"
+      apn="rogers-core-appl1.apn"
+      type="default,ia,mms,supl"
+      mmsc="http://mms.gprs.rogers.com"
+      mmsproxy="mmsproxy.rogers.com"
+      mmsport="80"
+      mvno_type="gid"
+      mvno_match_data="D4"
+  />
+
+  <apn carrier="SaskTel Internet"
       carrier_id = "580"
       mcc="302"
       mnc="780"
@@ -9295,6 +9236,7 @@
       mmsc="http://mms.sasktel.com/"
       mmsproxy="mig.sasktel.com"
       mmsport="80"
+      protocol="IPV4V6"
   />
 
   <apn carrier="Verizon CDMA HRPD"
@@ -12740,30 +12682,6 @@
       mmsport="9401"
   />
 
-  <apn carrier="Rogers Internet"
-      carrier_id = "1811"
-      mcc="310"
-      mnc="720"
-      apn="internet.com"
-      user=""
-      password=""
-      proxy="10.128.1.69"
-      port="80"
-      type="default,ia"
-  />
-
-  <apn carrier="Rogers Media"
-      carrier_id = "1811"
-      mcc="310"
-      mnc="720"
-      apn="media.com"
-      user="media"
-      password="mda01"
-      proxy="10.128.1.69"
-      port="80"
-      type="mms"
-  />
-
   <apn carrier="appalachian"
       carrier_id = "1813"
       mcc="310"
@@ -28357,20 +28275,6 @@
       type="mms"
   />
 
-  <apn carrier='Consumer Cellular'
-      mcc='410'
-      mnc='310'
-      apn='att.mvno'
-      type='default,ia,mms,supl,hipri,fota'
-      protocol='IP'
-      roaming_protocol='IP'
-      mmsc='http://mms.fido.ca'
-      mmsproxy='mmsproxy.fido.ca'
-      mmsport='80'
-      mvno_type='gid'
-      mvno_match_data='2AC9'
-  />
-
   <apn carrier="AWCC"
       carrier_id = "452"
       mcc="412"