merge in lmp-release history after reset to 777108354b4f9a197622b232b6616869c74157f5

commit: 5cf5b8fe46f3c04a4cc91bb5606363bf28a7fa39 [log] [tgz]
author: The Android Automerger <android-build@google.com> Tue Sep 16 06:09:30 2014 -0700
committer: The Android Automerger <android-build@google.com> Tue Sep 16 06:09:30 2014 -0700
tree: 3c58a154be11d5334c29c9126775c66d920f8761
parent: 777108354b4f9a197622b232b6616869c74157f5 [diff]
parent: c81e01ef11a07d1845fc8063f13d1b98416fc55d [diff]
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index c5437b1..b0e0f45 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml

@@ -68,12 +68,9 @@
       mnc="01"
       apn="VZW800"
       type="vzw800"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="5"
   />
 
   <apn carrier="Test 800"
@@ -81,12 +78,9 @@
       mnc="01"
       apn="VZW800"
       type="vzw800"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="5"
   />
 
   <apn carrier="Test FOTA"
@@ -94,12 +88,9 @@
       mnc="01"
       apn="VZWADMIN"
       type="fota"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="2"
   />
 
   <apn carrier="Test FOTA"
@@ -107,38 +98,29 @@
       mnc="01"
       apn="VZWADMIN"
       type="fota"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="2"
   />
 
   <apn carrier="Test CBS"
       mcc="001"
       mnc="01"
       apn="VZWAPP"
-      type="cbs"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="4"
   />
 
   <apn carrier="Test CBS"
       mcc="001"
       mnc="01"
       apn="VZWAPP"
-      type="cbs"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="4"
   />
 
   <apn carrier="Test IMS"
@@ -146,12 +128,9 @@
       mnc="01"
       apn="VZWIMS"
       type="ims,ia"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="1"
   />
 
   <apn carrier="Test IMS"
@@ -159,12 +138,9 @@
       mnc="01"
       apn="VZWIMS"
       type="ims,ia"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="1"
   />
 
   <apn carrier="Test Internet"
@@ -172,14 +148,12 @@
       mnc="01"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
+      type="default,dun"
       carrier_enabled="false"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       authtype="3"
       bearer="6"
-      class="3"
   />
 
   <apn carrier="Test Internet"
@@ -187,13 +161,10 @@
       mnc="01"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="default,dun"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="3"
   />
 
   <apn carrier="Test Internet"
@@ -201,16 +172,10 @@
       mnc="01"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="default,dun"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="3"
-      max_conns="1023"
-      max_conns_time="300"
-      wait_time="0"
   />
 
   <apn carrier="Test 800"
@@ -218,12 +183,9 @@
       mnc="010"
       apn="VZW800"
       type="vzw800"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="5"
   />
 
   <apn carrier="Test 800"
@@ -231,12 +193,9 @@
       mnc="010"
       apn="VZW800"
       type="vzw800"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="5"
   />
 
   <apn carrier="Test FOTA"
@@ -244,12 +203,9 @@
       mnc="010"
       apn="VZWADMIN"
       type="fota"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="2"
   />
 
   <apn carrier="Test FOTA"
@@ -257,38 +213,29 @@
       mnc="010"
       apn="VZWADMIN"
       type="fota"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="2"
   />
 
   <apn carrier="Test CBS"
       mcc="001"
       mnc="010"
       apn="VZWAPP"
-      type="cbs"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="4"
   />
 
   <apn carrier="Test CBS"
       mcc="001"
       mnc="010"
       apn="VZWAPP"
-      type="cbs"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="4"
   />
 
   <apn carrier="Test IMS"
@@ -296,12 +243,9 @@
       mnc="010"
       apn="VZWIMS"
       type="ims,ia"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="1"
   />
 
   <apn carrier="Test IMS"
@@ -309,12 +253,9 @@
       mnc="010"
       apn="VZWIMS"
       type="ims,ia"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="1"
   />
 
   <apn carrier="Test Internet"
@@ -322,14 +263,12 @@
       mnc="010"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
+      type="default,dun"
       carrier_enabled="false"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       authtype="3"
       bearer="6"
-      class="3"
   />
 
   <apn carrier="Test Internet"
@@ -337,13 +276,10 @@
       mnc="010"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="default,dun"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="3"
   />
 
   <apn carrier="Test Internet"
@@ -351,16 +287,10 @@
       mnc="010"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="default,dun"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="3"
-      max_conns="1023"
-      max_conns_time="300"
-      wait_time="0"
   />
 
   <apn carrier="Cosmote Wireless Internet"
@@ -4792,12 +4722,9 @@
       mnc="081"
       apn="VZW800"
       type="vzw800"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="5"
   />
 
   <apn carrier="Test 800"
@@ -4805,12 +4732,9 @@
       mnc="081"
       apn="VZW800"
       type="vzw800"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="5"
   />
 
   <apn carrier="Test FOTA"
@@ -4818,12 +4742,9 @@
       mnc="081"
       apn="VZWADMIN"
       type="fota"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="2"
   />
 
   <apn carrier="Test FOTA"
@@ -4831,38 +4752,29 @@
       mnc="081"
       apn="VZWADMIN"
       type="fota"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="2"
   />
 
   <apn carrier="Test CBS"
       mcc="246"
       mnc="081"
       apn="VZWAPP"
-      type="cbs"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="4"
   />
 
   <apn carrier="Test CBS"
       mcc="246"
       mnc="081"
       apn="VZWAPP"
-      type="cbs"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="4"
   />
 
   <apn carrier="Test IMS"
@@ -4870,12 +4782,9 @@
       mnc="081"
       apn="VZWIMS"
       type="ims,ia"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="1"
   />
 
   <apn carrier="Test IMS"
@@ -4883,12 +4792,9 @@
       mnc="081"
       apn="VZWIMS"
       type="ims,ia"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="1"
   />
 
   <apn carrier="Test Internet"
@@ -4896,14 +4802,12 @@
       mnc="081"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
+      type="default,dun"
       carrier_enabled="false"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       authtype="3"
       bearer="6"
-      class="3"
   />
 
   <apn carrier="Test Internet"
@@ -4911,13 +4815,10 @@
       mnc="081"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="default,dun"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="3"
   />
 
   <apn carrier="Test Internet"
@@ -4925,16 +4826,10 @@
       mnc="081"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="default,dun"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="3"
-      max_conns="1023"
-      max_conns_time="300"
-      wait_time="0"
   />
 
   <apn carrier="Test 800"
@@ -4942,12 +4837,9 @@
       mnc="81"
       apn="VZW800"
       type="vzw800"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="5"
   />
 
   <apn carrier="Test 800"
@@ -4955,12 +4847,9 @@
       mnc="81"
       apn="VZW800"
       type="vzw800"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="5"
   />
 
   <apn carrier="Test FOTA"
@@ -4968,12 +4857,9 @@
       mnc="81"
       apn="VZWADMIN"
       type="fota"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="2"
   />
 
   <apn carrier="Test FOTA"
@@ -4981,38 +4867,29 @@
       mnc="81"
       apn="VZWADMIN"
       type="fota"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="2"
   />
 
   <apn carrier="Test CBS"
       mcc="246"
       mnc="81"
       apn="VZWAPP"
-      type="cbs"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="4"
   />
 
   <apn carrier="Test CBS"
       mcc="246"
       mnc="81"
       apn="VZWAPP"
-      type="cbs"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="4"
   />
 
   <apn carrier="Test IMS"
@@ -5020,12 +4897,9 @@
       mnc="81"
       apn="VZWIMS"
       type="ims,ia"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="1"
   />
 
   <apn carrier="Test IMS"
@@ -5033,12 +4907,9 @@
       mnc="81"
       apn="VZWIMS"
       type="ims,ia"
-      inactivetimer="-1"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="1"
   />
 
   <apn carrier="Test Internet"
@@ -5046,14 +4917,12 @@
       mnc="81"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
+      type="default,dun"
       carrier_enabled="false"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       authtype="3"
       bearer="6"
-      class="3"
   />
 
   <apn carrier="Test Internet"
@@ -5061,13 +4930,10 @@
       mnc="81"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="default,dun"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
-      class="3"
   />
 
   <apn carrier="Test Internet"
@@ -5075,16 +4941,10 @@
       mnc="81"
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,mms,dun,stdhipri"
-      inactivetimer="-1"
-      carrier_enabled="true"
+      type="default,dun"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-      class="3"
-      max_conns="1023"
-      max_conns_time="300"
-      wait_time="0"
   />
 
   <apn carrier="LMT Internet"
@@ -7179,7 +7039,6 @@
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
       type="default,dun"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
@@ -7189,7 +7048,6 @@
       mnc="028"
       apn="VZWADMIN"
       type="fota"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
@@ -7199,7 +7057,6 @@
       mnc="028"
       apn="VZWIMS"
       type="ims,ia"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
@@ -7209,8 +7066,7 @@
       mnc="028"
       apn="VZWAPP"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="cbs,hipri,mms"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
@@ -9901,7 +9757,6 @@
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
       type="default,dun"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
@@ -9913,7 +9768,6 @@
       apn="VZWINTERNET"
       mmsc="http://mms.vtext.com/servlets/mms"
       type="default,dun"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
@@ -9924,7 +9778,6 @@
       mnc="390"
       apn="VZWADMIN"
       type="fota"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
@@ -9935,7 +9788,6 @@
       mnc="390"
       apn="VZWADMIN"
       type="fota"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
@@ -9946,7 +9798,6 @@
       mnc="390"
       apn="VZWIMS"
       type="ims,ia"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
@@ -9957,7 +9808,6 @@
       mnc="390"
       apn="VZWIMS"
       type="ims,ia"
-      carrier_enabled="true"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
@@ -9968,8 +9818,7 @@
       mnc="390"
       apn="VZWAPP"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="cbs,hipri,mms"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
@@ -9980,8 +9829,7 @@
       mnc="390"
       apn="VZWAPP"
       mmsc="http://mms.vtext.com/servlets/mms"
-      type="cbs,hipri,mms"
-      carrier_enabled="true"
+      type="cbs,mms"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="13"
commit	5cf5b8fe46f3c04a4cc91bb5606363bf28a7fa39	[log] [tgz]
author	The Android Automerger <android-build@google.com>	Tue Sep 16 06:09:30 2014 -0700
committer	The Android Automerger <android-build@google.com>	Tue Sep 16 06:09:30 2014 -0700
tree	3c58a154be11d5334c29c9126775c66d920f8761
parent	777108354b4f9a197622b232b6616869c74157f5 [diff]
parent	c81e01ef11a07d1845fc8063f13d1b98416fc55d [diff]