merge in oc-r6-release history after reset to oc-release
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 2b3235d..72c1eb5 100755
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -12946,20 +12946,6 @@
bearer_bitmask="6"
/>
- <apn carrier="USCCROAMING"
- mcc="204"
- mnc="04"
- apn="usccinternet"
- mmsport=""
- mmsproxy=""
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- mvno_type="spn"
- mvno_match_data="U.S. Cellular"
- type="mms,fota,default,supl"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- />
-
<apn carrier="leaco"
mcc="311"
mnc="310"
@@ -14123,7 +14109,40 @@
mmsport="8080"
/>
- <!-- bearer 4, 5, 6, 7, 8, 12 -->
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="580"
+ apn="usccinternet"
+ type="ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="580"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="13"
+ mtu="1422"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="580"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
+ mtu="1422"
+ />
+
+ <!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
mnc="580"
@@ -14138,15 +14157,13 @@
<apn carrier="U.S. Cellular"
mcc="311"
- mnc="580"
+ mnc="581"
apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
+ type="ia"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
- mtu="1422"
/>
+
<apn carrier="U.S. Cellular"
mcc="311"
mnc="581"
@@ -14155,7 +14172,19 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
+ bearer_bitmask="13"
+ mtu="1422"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="581"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
mtu="1422"
/>
@@ -14176,13 +14205,35 @@
mcc="311"
mnc="582"
apn="usccinternet"
+ type="ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="582"
+ apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
+ bearer_bitmask="13"
mtu="1422"
/>
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="582"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
+ mtu="1422"
+ />
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14200,13 +14251,35 @@
mcc="311"
mnc="583"
apn="usccinternet"
+ type="ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="583"
+ apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
+ bearer_bitmask="13"
mtu="1422"
/>
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="583"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
+ mtu="1422"
+ />
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14224,13 +14297,35 @@
mcc="311"
mnc="584"
apn="usccinternet"
+ type="ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="584"
+ apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
+ bearer_bitmask="13"
mtu="1422"
/>
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="584"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
+ mtu="1422"
+ />
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14248,13 +14343,35 @@
mcc="311"
mnc="585"
apn="usccinternet"
+ type="ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="585"
+ apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
+ bearer_bitmask="13"
mtu="1422"
/>
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="585"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
+ mtu="1422"
+ />
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14272,13 +14389,35 @@
mcc="311"
mnc="586"
apn="usccinternet"
+ type="ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="586"
+ apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
+ bearer_bitmask="13"
mtu="1422"
/>
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="586"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
+ mtu="1422"
+ />
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14296,13 +14435,35 @@
mcc="311"
mnc="587"
apn="usccinternet"
+ type="ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="587"
+ apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
+ bearer_bitmask="13"
mtu="1422"
/>
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="587"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
+ mtu="1422"
+ />
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14320,13 +14481,35 @@
mcc="311"
mnc="588"
apn="usccinternet"
+ type="ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="588"
+ apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
+ bearer_bitmask="13"
mtu="1422"
/>
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="588"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
+ mtu="1422"
+ />
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14344,13 +14527,35 @@
mcc="311"
mnc="589"
apn="usccinternet"
+ type="ia"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="589"
+ apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13|14"
+ bearer_bitmask="13"
mtu="1422"
/>
+
+ <apn carrier="U.S. Cellular"
+ mcc="311"
+ mnc="589"
+ apn="usccinternet"
+ mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+ type="default,mms,dun,hipri,fota"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ bearer_bitmask="14"
+ mtu="1422"
+ />
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"