Correct APNs for Verizon and ATT

For Verizon : CDMA use dummy apn, EHRPD and LTE use configured APN
For ATT : use nxtgenphone instead of phone

Change-Id: I19a45591ad32b3b68e15d6efc07e0e15bea669f8
diff --git a/etc/apns-conf_verizon.xml b/etc/apns-conf_verizon.xml
index 425777f..da1802f 100644
--- a/etc/apns-conf_verizon.xml
+++ b/etc/apns-conf_verizon.xml
@@ -7,9 +7,55 @@
         mcc="310"
         mnc="004"
         apn="internet"
-        type="default,mms,dun"
+        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"
@@ -19,6 +65,16 @@
         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"
@@ -27,6 +83,16 @@
         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"
@@ -35,6 +101,16 @@
         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"
@@ -44,56 +120,80 @@
         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="LTE - Verizon Internet"
+    <apn carrier="Verizon"
         mcc="311"
         mnc="480"
-        apn="VZWINTERNET"
-        type="default,mms,dun"
+        apn="internet"
+        type="default,mms,dun,supl,hipri,fota,ims,cbs"
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
-        roaming_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="LTE - Verizon Internet"
+    <apn carrier="Verizon"
         mcc="311"
         mnc="480"
-        apn="VZWINTERNET"
-        type="default,mms,dun"
+        apn="internet"
+        type="default,mms,dun,supl,hipri,fota,ims,cbs"
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
         bearer="7"
     />
-    <apn carrier="LTE - Verizon Internet"
+    <apn carrier="Verizon"
         mcc="311"
         mnc="480"
-        apn="VZWINTERNET"
-        type="default,mms,dun"
+        apn="internet"
+        type="default,mms,dun,supl,hipri,fota,ims,cbs"
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
         bearer="8"
     />
-    <apn carrier="LTE - Verizon Internet"
+    <apn carrier="Verizon"
         mcc="311"
         mnc="480"
-        apn="VZWINTERNET"
-        type="default,mms,dun"
+        apn="internet"
+        type="default,mms,dun,supl,hipri,fota,ims,cbs"
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
-        roaming_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"
+        type="default,dun,supl"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
         bearer="14"
@@ -133,7 +233,6 @@
         type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
-        bearer="14"
     />
     <apn carrier="LTE - VZW Roaming FOTA"
         mcc="204"
@@ -142,7 +241,6 @@
         type="fota"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
-        bearer="14"
     />
     <apn carrier="LTE - VZW Roaming IMS"
         mcc="204"
@@ -151,7 +249,6 @@
         type="ims"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
-        bearer="14"
     />
     <apn carrier="LTE - VZW Roaming CBS"
         mcc="204"
@@ -161,7 +258,6 @@
         mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
-        bearer="14"
     />
     <apn carrier="LTE - Test Internet"
         mcc="001"
@@ -317,7 +413,7 @@
         mcc="311"
         mnc="480"
         apn="VZWINTERNET"
-        type="default,dun"
+        type="default,dun,supl"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
         bearer="13"
@@ -350,43 +446,6 @@
         roaming_protocol="IPV4V6"
         bearer="13"
     />
-    <apn carrier="EHRPD - VZW Roaming Internet"
-        mcc="204"
-        mnc="04"
-        apn="VZWINTERNET"
-        type="default,dun"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Roaming FOTA"
-        mcc="204"
-        mnc="04"
-        apn="VZWADMIN"
-        type="fota"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Roaming IMS"
-        mcc="204"
-        mnc="04"
-        apn="VZWIMS"
-        type="ims"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <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="EHRPD - Test Internet"
         mcc="001"
         mnc="01"
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 82c65f6..34bc80c 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -5763,8 +5763,8 @@
   <apn carrier="ATT Phone"
       mcc="310"
       mnc="410"
-      apn="phone"
-      type="default,mms,supl,fota"
+      apn="nxtgenphone"
+      type="default,mms,supl,fota,hipri"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"