Merge "Remove invalid APN types in list" am: aa4657fa51 am: e4275ad534

Original change: https://android-review.googlesource.com/c/device/sample/+/1577783

Change-Id: I91f00b505fc99f7e9390def3cce5af01645f2d4a

1 files changed, 90 insertions, 99 deletions

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 5718e10..52e0fe0 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -569,7 +569,7 @@
       mmsc="http://pix.cspire.com"
       mvno_type="spn"
       mvno_match_data="C Spire"
-      type="default,internet,mms"
+      type="default,mms"
       protocol="IPV4V6"
   />
 
@@ -584,7 +584,7 @@
       mmsc="http://pix.cspire.com"
       mvno_type="spn"
       mvno_match_data="C Spire"
-      type="admin,fota,ota"
+      type="fota"
       protocol="IPV4V6"
   />
 
@@ -599,7 +599,7 @@
       mmsc="http://pix.cspire.com"
       mvno_type="spn"
       mvno_match_data="C Spire"
-      type="dun,pam"
+      type="dun"
       protocol="IPV4V6"
   />
 
@@ -1161,7 +1161,7 @@
       mmsproxy="10.151.0.1"
       mmsport="8080"
       protocol="IP"
-      type="default,mms,supl,agps,fota"
+      type="default,mms,supl,fota"
   />
 
   <apn carrier="SFR option modem"
@@ -1367,7 +1367,7 @@
       mnc="10"
       apn="internetcoriolis"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       mvno_type="gid"
       mvno_match_data="12"
   />
@@ -1451,7 +1451,7 @@
       mnc="10"
       apn="internet68"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       mvno_type="spn"
       mvno_match_data="Keyyo Mobile"
   />
@@ -1478,7 +1478,7 @@
       proxy="192.168.21.11"
       port="8080"
       authtype="0"
-      type="default,supl,agps,fota"
+      type="default,supl,fota"
       mvno_type="spn"
       mvno_match_data="Keyyo Mobile"
   />
@@ -1489,7 +1489,7 @@
       mnc="10"
       apn="internet68"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       mvno_type="spn"
       mvno_match_data="ZERO FORFAIT"
   />
@@ -1516,7 +1516,7 @@
       proxy="192.168.21.9"
       port="8080"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       mvno_type="spn"
       mvno_match_data="RegloMobile"
   />
@@ -2195,7 +2195,7 @@
       mnc="06"
       apn="gprsmov.pepephone.com"
       authtype="0"
-      type="default,supl,agps,fota"
+      type="default,supl,fota"
       mvno_type="spn"
       mvno_match_data="pepephone"
   />
@@ -2738,7 +2738,7 @@
       mnc="01"
       apn="web.htgprs"
       authtype="1"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       mvno_type="spn"
       mvno_match_data="bonbon"
   />
@@ -2882,7 +2882,7 @@
       authtype="0"
       user="mts"
       password="064"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
   />
 
   <apn carrier="T-Mobile MMS"
@@ -3110,7 +3110,7 @@
       mnc="01"
       apn="web.noverca.it"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       mvno_type="spn"
       mvno_match_data="Noverca"
   />
@@ -3195,7 +3195,7 @@
       mnc="10"
       apn="wap.postemobile.it"
       authtype="0"
-      type="default,supl,agps,fota"
+      type="default,supl,fota"
       mvno_type="spn"
       mvno_match_data="PosteMobile"
   />
@@ -3231,19 +3231,19 @@
       mnc="10"
       apn="mobile.erg.it"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       mvno_type="spn"
       mvno_match_data="ERG"
   />
 
   <apn carrier="DailyTelecomWAP"
-        carrier_id = "2438"
-        mcc="222"
-        mnc="10"
-        apn="wap.dtm.it"
-        type="default,supl,dun"
-        mvno_type="spn"
-        mvno_match_data="Daily Telecom"
+      carrier_id = "2438"
+      mcc="222"
+      mnc="10"
+      apn="wap.dtm.it"
+      type="default,supl,dun"
+      mvno_type="spn"
+      mvno_match_data="Daily Telecom"
   />
 
   <apn carrier="DIGI Italy"
@@ -4360,7 +4360,7 @@
       mnc="30"
       apn="SOS"
       authtype="1"
-      type="Emergency"
+      type="emergency"
       protocol="IPV6"
   />
 
@@ -4437,7 +4437,7 @@
       authtype="1"
       mvno_type="gid"
       mvno_match_data="B3"
-      type="Emergency"
+      type="emergency"
       protocol="IPV6"
   />
 
@@ -4493,7 +4493,7 @@
       authtype="1"
       mvno_type="gid"
       mvno_match_data="C3"
-      type="Emergency"
+      type="emergency"
       protocol="IPV6"
   />
 
@@ -4516,7 +4516,7 @@
       mnc="33"
       apn="tslpaygnet"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       mvno_type="spn"
       mvno_match_data="LIFE"
   />
@@ -4568,7 +4568,7 @@
       mnc="33"
       apn="SOS"
       authtype="1"
-      type="Emergency"
+      type="emergency"
       protocol="IPV6"
   />
 
@@ -4763,7 +4763,7 @@
       mnc="01"
       apn="internet"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
   />
 
   <apn carrier="DK TDC mms"
@@ -7268,7 +7268,7 @@
       mnc="03"
       apn="gprs.is"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
   />
 
   <apn carrier="Vodafone MMS"
@@ -7841,7 +7841,7 @@
       mcc="302"
       mnc="220"
       apn="sp.mb.com"
-      type="default,mms,agps,supl,fota,hipri"
+      type="default,mms,supl,fota,hipri"
       mmsc="http://aliasredirect.net/proxy/mb/mmsc"
       mmsproxy="mmscproxy.mobility.ca"
       mmsport="8799"
@@ -7962,7 +7962,7 @@
       mcc="302"
       mnc="370"
       apn="ltemobile.apn"
-      type="default,mms,agps,supl,fota,hipri"
+      type="default,mms,supl,fota,hipri"
       mmsproxy="mmsproxy.fido.ca"
       mmsc="http://mms.fido.ca"
       mmsport="80"
@@ -8171,7 +8171,7 @@
       carrier_id = "2090"
       mcc="302"
       apn="ltemobile.apn"
-      type="default,mms,agps,supl,fota,hipri"
+      type="default,mms,supl,fota,hipri"
       protocol="IPV4V6"
       roaming_protocol="IP"
       mmsc="http://mms.gprs.rogers.com"
@@ -8198,7 +8198,7 @@
       carrier_id = "2057"
       mcc="302"
       apn="ltemobile.apn"
-      type="default,mms,agps,supl,fota,hipri"
+      type="default,mms,supl,fota,hipri"
       protocol="IPV4V6"
       roaming_protocol="IP"
       mmsc="http://mms.gprs.rogers.com"
@@ -8223,7 +8223,7 @@
       mcc="302"
       mnc="720"
       apn="ltemobile.apn"
-      type="default,mms,agps,supl,fota,hipri"
+      type="default,mms,supl,fota,hipri"
       mmsproxy="mmsproxy.rogers.com"
       mmsc="http://mms.gprs.rogers.com"
       mmsport="80"
@@ -10998,7 +10998,7 @@
       mcc="310"
       mnc="470"
       apn="admin.4g.ntelos.com"
-      type="admin,fota,ota"
+      type="fota"
       bearer_bitmask="13"
       mmsc="http://mms.ntelospcs.net"
       server="*"
@@ -11010,7 +11010,7 @@
       mcc="310"
       mnc="470"
       apn="admin.4g.ntelos.com"
-      type="admin,fota,ota"
+      type="fota"
       bearer_bitmask="14"
       mmsc="http://mms.ntelospcs.net"
       server="*"
@@ -11022,7 +11022,7 @@
       mcc="310"
       mnc="470"
       apn="internet.4g.ntelos.com"
-      type="default,internet,supl,hipri,mms"
+      type="default,supl,hipri,mms"
       mmsc="http://mms.ntelospcs.net"
       server="*"
       protocol="IPV4V6"
@@ -11033,7 +11033,7 @@
       mcc="310"
       mnc="470"
       apn="tethering.4g.ntelos.com"
-      type="dun,pam"
+      type="dun"
       bearer_bitmask="13"
       mmsc="http://mms.ntelospcs.net"
       server="*"
@@ -11045,7 +11045,7 @@
       mcc="310"
       mnc="470"
       apn="tethering.4g.ntelos.com"
-      type="dun,pam"
+      type="dun"
       bearer_bitmask="14"
       mmsc="http://mms.ntelospcs.net"
       server="*"
@@ -13635,7 +13635,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://pix.cspire.com"
-      type="admin,fota,ota"
+      type="fota"
       bearer_bitmask="14"
       protocol="IPV4V6"
   />
@@ -13649,7 +13649,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://pix.cspire.com"
-      type="admin,fota,ota"
+      type="fota"
       bearer_bitmask="13"
       protocol="IPV4V6"
   />
@@ -13663,7 +13663,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://pix.cspire.com"
-      type="default,internet,mms"
+      type="default,mms"
       protocol="IPV4V6"
   />
 
@@ -13676,7 +13676,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://pix.cspire.com"
-      type="dun,pam"
+      type="dun"
       bearer_bitmask="13"
       protocol="IPV4V6"
   />
@@ -13690,7 +13690,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://pix.cspire.com"
-      type="dun,pam"
+      type="dun"
       bearer_bitmask="14"
       protocol="IPV4V6"
   />
@@ -15659,15 +15659,6 @@
       protocol="IPV4V6"
       network_type_bitmask="13"
   />
-  <apn carrier="Sprint"
-      carrier_id = "1788"
-      mcc="311"
-      mnc="882"
-      apn="arm.ericsson.iot"
-      type="admin"
-      protocol="IPV4V6"
-      network_type_bitmask="13"
-  />
 
   <apn carrier="MobileNation"
       carrier_id = "2258"
@@ -15678,7 +15669,7 @@
       mmsport="8081"
       mmsproxy="mms.mymn3g.net"
       mmsc="http://mms.mymn3g.net"
-      type="default,internet,admin,fota,dun,mms"
+      type="default,fota,dun,mms"
       protocol="IPV4V6"
   />
 
@@ -15785,7 +15776,7 @@
       mmsport="80"
       mmsproxy=""
       mmsc="http://mms.rinawireless.com"
-      type="default,internet,admin,fota,dun,mms"
+      type="default,fota,dun,mms"
       protocol="IPV4V6"
   />
 
@@ -15993,7 +15984,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
-      type="admin,fota,ota"
+      type="fota"
       bearer_bitmask="14"
       protocol="IP"
   />
@@ -16007,7 +15998,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
-      type="admin,fota,ota"
+      type="fota"
       bearer_bitmask="13"
       protocol="IP"
   />
@@ -16021,7 +16012,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
-      type="default,internet,supl,hipri,mms"
+      type="default,supl,hipri,mms"
       protocol="IPV4V6"
   />
 
@@ -16034,7 +16025,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
-      type="dun,pam"
+      type="dun"
       bearer_bitmask="14"
       protocol="IPV4V6"
   />
@@ -16048,7 +16039,7 @@
       mmsport=""
       mmsproxy=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
-      type="dun,pam"
+      type="dun"
       bearer_bitmask="13"
       protocol="IPV4V6"
   />
@@ -18393,7 +18384,7 @@
       mcc="404"
       mnc="17"
       apn="aircelgprs"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -18443,7 +18434,7 @@
       mcc="404"
       mnc="18"
       apn="rcomnet"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -18620,7 +18611,7 @@
       mcc="404"
       mnc="25"
       apn="aircelgprs"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -18700,7 +18691,7 @@
       mcc="404"
       mnc="28"
       apn="aircelgprs"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -18751,7 +18742,7 @@
       mcc="404"
       mnc="29"
       apn="aircelgprs"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -18870,7 +18861,7 @@
       mcc="404"
       mnc="33"
       apn="aircelgprs"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -18960,7 +18951,7 @@
       mcc="404"
       mnc="35"
       apn="aircelgprs"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -19010,7 +19001,7 @@
       mcc="404"
       mnc="36"
       apn="rcomnet"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -19051,7 +19042,7 @@
       mcc="404"
       mnc="37"
       apn="aircelgprs"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -19166,7 +19157,7 @@
       mcc="404"
       mnc="41"
       apn="aircelgprs"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -19257,7 +19248,7 @@
       mcc="404"
       mnc="42"
       apn="aircelgprs"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -19880,7 +19871,7 @@
       mmsc="http://mtnlmms/"
       mmsproxy="10.10.10.10"
       mmsport="9401"
-      type="default,mms,supl,agps,fota,dun"
+      type="default,mms,supl,fota,dun"
   />
 
   <apn carrier="MTNL"
@@ -19894,7 +19885,7 @@
       mmsc="http://mtnlmms/"
       mmsproxy="10.10.10.10"
       mmsport="9401"
-      type="default,mms,supl,agps,fota,dun"
+      type="default,mms,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
   />
@@ -23868,7 +23859,7 @@
       mcc="405"
       mnc="854"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -23893,7 +23884,7 @@
       mcc="405"
       mnc="855"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -23918,7 +23909,7 @@
       mcc="405"
       mnc="856"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -23943,7 +23934,7 @@
       mcc="405"
       mnc="857"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -23968,7 +23959,7 @@
       mcc="405"
       mnc="858"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -23993,7 +23984,7 @@
       mcc="405"
       mnc="859"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24018,7 +24009,7 @@
       mcc="405"
       mnc="860"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24043,7 +24034,7 @@
       mcc="405"
       mnc="861"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24068,7 +24059,7 @@
       mcc="405"
       mnc="862"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24093,7 +24084,7 @@
       mcc="405"
       mnc="863"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24118,7 +24109,7 @@
       mcc="405"
       mnc="864"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24143,7 +24134,7 @@
       mcc="405"
       mnc="865"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24168,7 +24159,7 @@
       mcc="405"
       mnc="866"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24193,7 +24184,7 @@
       mcc="405"
       mnc="867"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24218,7 +24209,7 @@
       mcc="405"
       mnc="868"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24243,7 +24234,7 @@
       mcc="405"
       mnc="869"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24268,7 +24259,7 @@
       mcc="405"
       mnc="870"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24293,7 +24284,7 @@
       mcc="405"
       mnc="871"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24318,7 +24309,7 @@
       mcc="405"
       mnc="872"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24343,7 +24334,7 @@
       mcc="405"
       mnc="873"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -24368,7 +24359,7 @@
       mcc="405"
       mnc="874"
       apn="www"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       protocol="IP"
       roaming_protocol="IP"
       carrier_enabled="true"
@@ -26713,7 +26704,7 @@
       mcc="440"
       mnc="10"
       apn=""
-      type="Emergency"
+      type="emergency"
       protocol="IPV6"
       roaming_protocol="IPV6"
   />
@@ -28006,7 +27997,7 @@
       mnc="01"
       apn="gpinternet"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
   />
 
   <apn carrier="GP-MMS"
@@ -30483,7 +30474,7 @@
       mnc="0"
       apn="glowap"
       authtype="0"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
   />
 
   <apn carrier="Glo mms"
@@ -31412,7 +31403,7 @@
       mcc="646"
       mnc="02"
       apn="orangenet"
-      type="default,supl,agps,fota,dun"
+      type="default,supl,fota,dun"
       authtype="0"
   />
 
@@ -33757,7 +33748,7 @@
       mcc="732"
       mnc="123"
       apn="web.vmc.net.co"
-      type="default,supl,internet"
+      type="default,supl"
       authtype="1"
       mvno_match_data="Virgin Mobile"
       mvno_type="spn"