diff --git a/etc/apns-conf_verizon.xml b/etc/apns-conf_verizon.xml
deleted file mode 100644
index da1802f914f65cb80d91653b69d28a209d330cff..0000000000000000000000000000000000000000
--- a/etc/apns-conf_verizon.xml
+++ /dev/null
@@ -1,599 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- use empty string to specify no proxy or port -->
-<!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="8">
- <apn carrier="Verizon"
- mcc="310"
- mnc="004"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="4"
- />
- <apn carrier="Verizon"
- mcc="310"
- mnc="004"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="5"
- />
- <apn carrier="Verizon"
- mcc="310"
- mnc="004"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="6"
- />
- <apn carrier="Verizon"
- mcc="310"
- mnc="004"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="7"
- />
- <apn carrier="Verizon"
- mcc="310"
- mnc="004"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="8"
- />
- <apn carrier="Verizon"
- mcc="310"
- mnc="004"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="12"
- />
-
- <apn carrier="Verizon Internet"
- mcc="310"
- mnc="004"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="Verizon Internet"
- mcc="310"
- mnc="004"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="Verizon FOTA"
- mcc="310"
- mnc="004"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="Verizon FOTA"
- mcc="310"
- mnc="004"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="Verizon IMS"
- mcc="310"
- mnc="004"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="Verizon IMS"
- mcc="310"
- mnc="004"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="Verizon CBS"
- mcc="310"
- mnc="004"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="Verizon CBS"
- mcc="310"
- mnc="004"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
-
- <!-- VZW CDMA -->
- <apn carrier="Verizon"
- mcc="311"
- mnc="480"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="4"
- />
- <apn carrier="Verizon"
- mcc="311"
- mnc="480"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="5"
- />
- <apn carrier="Verizon"
- mcc="311"
- mnc="480"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="6"
- />
- <apn carrier="Verizon"
- mcc="311"
- mnc="480"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="7"
- />
- <apn carrier="Verizon"
- mcc="311"
- mnc="480"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="8"
- />
- <apn carrier="Verizon"
- mcc="311"
- mnc="480"
- apn="internet"
- type="default,mms,dun,supl,hipri,fota,ims,cbs"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- bearer="12"
- />
- <!-- Modify Apn database for VZW LTE support -->
- <apn carrier="LTE - Verizon Internet"
- mcc="311"
- mnc="480"
- apn="VZWINTERNET"
- type="default,dun,supl"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - Verizon FOTA"
- mcc="311"
- mnc="480"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - Verizon IMS"
- mcc="311"
- mnc="480"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - Verizon CBS"
- mcc="311"
- mnc="480"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Roaming Internet"
- mcc="204"
- mnc="04"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- />
- <apn carrier="LTE - VZW Roaming FOTA"
- mcc="204"
- mnc="04"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- />
- <apn carrier="LTE - VZW Roaming IMS"
- mcc="204"
- mnc="04"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- />
- <apn carrier="LTE - VZW Roaming CBS"
- mcc="204"
- mnc="04"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- />
- <apn carrier="LTE - Test Internet"
- mcc="001"
- mnc="01"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - Test FOTA"
- mcc="001"
- mnc="01"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - Test IMS"
- mcc="001"
- mnc="01"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - Test CBS"
- mcc="001"
- mnc="01"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test Internet"
- mcc="001"
- mnc="010"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test FOTA"
- mcc="001"
- mnc="010"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test IMS"
- mcc="001"
- mnc="010"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test CBS"
- mcc="001"
- mnc="010"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test Internet"
- mcc="246"
- mnc="81"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test FOTA"
- mcc="246"
- mnc="81"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test IMS"
- mcc="246"
- mnc="81"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test CBS"
- mcc="246"
- mnc="81"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test Internet"
- mcc="246"
- mnc="081"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test FOTA"
- mcc="246"
- mnc="081"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test IMS"
- mcc="246"
- mnc="081"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <apn carrier="LTE - VZW Test CBS"
- mcc="246"
- mnc="081"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="14"
- />
- <!-- END modify Apn database for VZW LTE support -->
- <!-- Modify Apn database for VZW EHRPD support -->
- <apn carrier="EHRPD - Verizon Internet"
- mcc="311"
- mnc="480"
- apn="VZWINTERNET"
- type="default,dun,supl"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - Verizon FOTA"
- mcc="311"
- mnc="480"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - Verizon IMS"
- mcc="311"
- mnc="480"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - Verizon CBS"
- mcc="311"
- mnc="480"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - Test Internet"
- mcc="001"
- mnc="01"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - Test FOTA"
- mcc="001"
- mnc="01"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - Test IMS"
- mcc="001"
- mnc="01"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - Test CBS"
- mcc="001"
- mnc="01"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test Internet"
- mcc="001"
- mnc="010"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test FOTA"
- mcc="001"
- mnc="010"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test IMS"
- mcc="001"
- mnc="010"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test CBS"
- mcc="001"
- mnc="010"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test Internet"
- mcc="246"
- mnc="81"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test FOTA"
- mcc="246"
- mnc="81"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test IMS"
- mcc="246"
- mnc="81"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test CBS"
- mcc="246"
- mnc="81"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test Internet"
- mcc="246"
- mnc="081"
- apn="VZWINTERNET"
- type="default,dun"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test FOTA"
- mcc="246"
- mnc="081"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test IMS"
- mcc="246"
- mnc="081"
- apn="VZWIMS"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <apn carrier="EHRPD - VZW Test CBS"
- mcc="246"
- mnc="081"
- apn="VZWAPP"
- type="cbs,mms"
- mmsc="http://mms.vtext.com/servlets/mms"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer="13"
- />
- <!-- END modify Apn database for VZW EHRPD support -->
-
-</apns>
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 24f5c510a9557d57df1be327a5423fa902c1ff85..4d8ef3d1a22c0347778c1e10e0fa0065cacb5fc2 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -140,6 +140,84 @@
type="default,supl,mms"
/>
+ <apn carrier="EHRPD - VZW Roaming Internet"
+ mcc="204"
+ mnc="04"
+ apn="VZWINTERNET"
+ type="default,dun"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="LTE - VZW Roaming Internet"
+ mcc="204"
+ mnc="04"
+ apn="VZWINTERNET"
+ type="default,dun"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="EHRPD - VZW Roaming FOTA"
+ mcc="204"
+ mnc="04"
+ apn="VZWADMIN"
+ type="fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="LTE - VZW Roaming FOTA"
+ mcc="204"
+ mnc="04"
+ apn="VZWADMIN"
+ type="fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="LTE - VZW Roaming IMS"
+ mcc="204"
+ mnc="04"
+ apn="VZWIMS"
+ type="ims,ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="EHRPD - VZW Roaming IMS"
+ mcc="204"
+ mnc="04"
+ apn="VZWIMS"
+ type="ims,ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="LTE - VZW Roaming CBS"
+ mcc="204"
+ mnc="04"
+ apn="VZWAPP"
+ type="cbs,mms"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="EHRPD - VZW Roaming CBS"
+ mcc="204"
+ mnc="04"
+ apn="VZWAPP"
+ type="cbs,mms"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
<apn carrier="KPN/Hi 4G LTE Mobiel internet"
mcc="204"
mnc="08"
@@ -5157,6 +5235,148 @@
mmsport="80"
/>
+ <apn carrier="Verizon"
+ mcc="310"
+ mnc="004"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="4"
+ />
+
+ <apn carrier="Verizon"
+ mcc="310"
+ mnc="004"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="5"
+ />
+
+ <apn carrier="Verizon"
+ mcc="310"
+ mnc="004"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="6"
+ />
+
+ <apn carrier="Verizon"
+ mcc="310"
+ mnc="004"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="7"
+ />
+
+ <apn carrier="Verizon"
+ mcc="310"
+ mnc="004"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="8"
+ />
+
+ <apn carrier="Verizon"
+ mcc="310"
+ mnc="004"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="12"
+ />
+
+ <apn carrier="Verizon Internet"
+ mcc="310"
+ mnc="004"
+ apn="VZWINTERNET"
+ type="default,dun"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="Verizon Internet"
+ mcc="310"
+ mnc="004"
+ apn="VZWINTERNET"
+ type="default,dun"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+
+ <apn carrier="Verizon FOTA"
+ mcc="310"
+ mnc="004"
+ apn="VZWADMIN"
+ type="fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="Verizon FOTA"
+ mcc="310"
+ mnc="004"
+ apn="VZWADMIN"
+ type="fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+
+ <apn carrier="Verizon IMS"
+ mcc="310"
+ mnc="004"
+ apn="VZWIMS"
+ type="ims"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="Verizon IMS"
+ mcc="310"
+ mnc="004"
+ apn="VZWIMS"
+ type="ims,ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+
+ <apn carrier="Verizon CBS"
+ mcc="310"
+ mnc="004"
+ apn="VZWAPP"
+ type="cbs,mms"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="Verizon CBS"
+ mcc="310"
+ mnc="004"
+ apn="VZWAPP"
+ type="cbs,mms"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+
<apn carrier="myBlue Pix"
mcc="310"
mnc="030"
@@ -6311,6 +6531,148 @@
mvno_type="imsi"
/>
+ <apn carrier="Verizon"
+ mcc="311"
+ mnc="480"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="4"
+ />
+
+ <apn carrier="Verizon"
+ mcc="311"
+ mnc="480"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="5"
+ />
+
+ <apn carrier="Verizon"
+ mcc="311"
+ mnc="480"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="6"
+ />
+
+ <apn carrier="Verizon"
+ mcc="311"
+ mnc="480"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="7"
+ />
+
+ <apn carrier="Verizon"
+ mcc="311"
+ mnc="480"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="8"
+ />
+
+ <apn carrier="Verizon"
+ mcc="311"
+ mnc="480"
+ apn="internet"
+ type="default,mms,dun,supl,hipri,fota,ims,cbs"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ bearer="12"
+ />
+
+ <apn carrier="EHRPD - Verizon Internet"
+ mcc="311"
+ mnc="480"
+ apn="VZWINTERNET"
+ type="default,dun,supl"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="LTE - Verizon Internet"
+ mcc="311"
+ mnc="480"
+ apn="VZWINTERNET"
+ type="default,dun,supl"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+
+ <apn carrier="EHRPD - Verizon FOTA"
+ mcc="311"
+ mnc="480"
+ apn="VZWADMIN"
+ type="fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="LTE - Verizon FOTA"
+ mcc="311"
+ mnc="480"
+ apn="VZWADMIN"
+ type="fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+
+ <apn carrier="EHRPD - Verizon IMS"
+ mcc="311"
+ mnc="480"
+ apn="VZWIMS"
+ type="ims,ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="LTE - Verizon IMS"
+ mcc="311"
+ mnc="480"
+ apn="VZWIMS"
+ type="ims,ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+
+ <apn carrier="EHRPD - Verizon CBS"
+ mcc="311"
+ mnc="480"
+ apn="VZWAPP"
+ type="cbs,mms"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
+ <apn carrier="LTE - Verizon CBS"
+ mcc="311"
+ mnc="480"
+ apn="VZWAPP"
+ type="cbs,mms"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+
<apn carrier="INTERNET CLARO"
mcc="330"
mnc="110"
diff --git a/etc/test-apns-conf_verizon.xml b/etc/test-apns-conf_verizon.xml
index fa4c32c94bdcb6e52690968128da774985d3a8fd..409ec8037df84486a07fe150d0dfcb096ea2c5bb 100644
--- a/etc/test-apns-conf_verizon.xml
+++ b/etc/test-apns-conf_verizon.xml
@@ -33,7 +33,7 @@
mcc="310"
mnc="004"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
/>
@@ -49,6 +49,130 @@
roaming_protocol="IPV4V6"
/>
+ <apn carrier=" ALU Test-SIM Internet"
+ mcc="310"
+ mnc="028"
+ apn="VZWINTERNET"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ type="default,dun"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+ <apn carrier=" ALU Test-SIM FOTA"
+ mcc="310"
+ mnc="028"
+ apn="VZWADMIN"
+ type="fota"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+ <apn carrier=" ALU Test-SIM IMS"
+ mcc="310"
+ mnc="028"
+ apn="VZWIMS"
+ type="ims,ia"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+ <apn carrier=" ALU Test-SIM CBS"
+ mcc="310"
+ mnc="028"
+ apn="VZWAPP"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ type="cbs,hipri,mms"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="Ericsson Test-SIM Internet"
+ mcc="311"
+ mnc="390"
+ apn="VZWINTERNET"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ type="default,dun"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+ <apn carrier="Ericsson Test-SIM Internet"
+ mcc="311"
+ mnc="390"
+ apn="VZWINTERNET"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ type="default,dun"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+ <apn carrier="Ericsson Test-SIM FOTA"
+ mcc="311"
+ mnc="390"
+ apn="VZWADMIN"
+ type="fota"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+ <apn carrier="Ericsson Test-SIM FOTA"
+ mcc="311"
+ mnc="390"
+ apn="VZWADMIN"
+ type="fota"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+ <apn carrier="Ericsson Test-SIM IMS"
+ mcc="311"
+ mnc="390"
+ apn="VZWIMS"
+ type="ims,ia"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+ <apn carrier="Ericsson Test-SIM IMS"
+ mcc="311"
+ mnc="390"
+ apn="VZWIMS"
+ type="ims,ia"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+ <apn carrier="Ericsson Test-SIM CBS"
+ mcc="311"
+ mnc="390"
+ apn="VZWAPP"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ type="cbs,hipri,mms"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="14"
+ />
+ <apn carrier="Ericsson Test-SIM CBS"
+ mcc="311"
+ mnc="390"
+ apn="VZWAPP"
+ mmsc="http://mms.vtext.com/servlets/mms"
+ type="cbs,hipri,mms"
+ carrier_enabled="true"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer="13"
+ />
+
<!-- Modify Apn database for VZW LTE support -->
<apn carrier="LTE - Verizon Internet"
mcc="311"
@@ -72,7 +196,7 @@
mcc="311"
mnc="480"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="14"
@@ -111,7 +235,7 @@
mcc="204"
mnc="04"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="14"
@@ -150,7 +274,7 @@
mcc="001"
mnc="01"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="14"
@@ -167,6 +291,15 @@
roaming_protocol="IPV4V6"
bearer="14"
/>
+ <apn carrier="Test 800"
+ mcc="001"
+ mnc="01"
+ apn="VZW800"
+ type="vzw800"
+ bearer="14"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
<apn carrier="LTE - VZW Test Internet"
mcc="001"
mnc="010"
@@ -189,7 +322,7 @@
mcc="001"
mnc="010"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="14"
@@ -206,6 +339,15 @@
roaming_protocol="IPV4V6"
bearer="14"
/>
+ <apn carrier="VZW Test 800"
+ mcc="001"
+ mnc="010"
+ apn="VZW800"
+ type="vzw800"
+ bearer="14"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
<apn carrier="LTE - VZW Test Internet"
mcc="246"
mnc="81"
@@ -228,7 +370,7 @@
mcc="246"
mnc="81"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="14"
@@ -267,7 +409,7 @@
mcc="246"
mnc="081"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="14"
@@ -308,7 +450,7 @@
mcc="311"
mnc="480"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="13"
@@ -347,7 +489,7 @@
mcc="204"
mnc="04"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="13"
@@ -386,7 +528,7 @@
mcc="001"
mnc="01"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="13"
@@ -403,6 +545,15 @@
roaming_protocol="IPV4V6"
bearer="13"
/>
+ <apn carrier="Test 800"
+ mcc="001"
+ mnc="01"
+ apn="VZW800"
+ type="vzw800"
+ bearer="13"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
<apn carrier="EHRPD - VZW Test Internet"
mcc="001"
mnc="010"
@@ -425,7 +576,7 @@
mcc="001"
mnc="010"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="13"
@@ -464,7 +615,7 @@
mcc="246"
mnc="81"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="13"
@@ -503,7 +654,7 @@
mcc="246"
mnc="081"
apn="VZWIMS"
- type="ims"
+ type="ims,ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="13"