Merge "Convert javadoc to Soong for device/sample"
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 56ee056..8f1e0f5 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -1069,6 +1069,15 @@
type="dun"
/>
+ <apn carrier="Be Aliv"
+ mcc="208"
+ mnc="09"
+ apn="pda.newcomobile.com"
+ type="default,supl"
+ mvno_match_data="208090021"
+ mvno_type="imsi"
+ />
+
<apn carrier="Truphone"
mcc="208"
mnc="09"
@@ -1570,6 +1579,22 @@
protocol="IPV4V6"
/>
+ <apn carrier="ALTECOM"
+ mcc="214"
+ mnc="02"
+ apn="altecom.net"
+ type="default"
+ />
+
+ <apn carrier="FIBRACAT"
+ mcc="214"
+ mnc="02"
+ apn="fibracat.cat"
+ type="default"
+ mvno_type="spn"
+ mvno_match_data="FIBRACAT"
+ />
+
<apn carrier="Orange Internet Móvil"
mcc="214"
mnc="03"
@@ -4255,6 +4280,8 @@
mmsproxy="mmsproxy.3.dk"
mmsport="8799"
type="default,supl,mms"
+ protocol="IPV4V6"
+ roaming_protocol="IP"
/>
<apn carrier="Telia SurfPort"
@@ -4412,6 +4439,8 @@
mmsproxy="mmsproxy.tre.se"
mmsport="8799"
type="default,supl,mms"
+ protocol="IPV4V6"
+ roaming_protocol="IP"
/>
<apn carrier="3"
@@ -4422,6 +4451,8 @@
mmsproxy="mmsproxy.tre.se"
mmsport="8799"
type="default,supl,mms"
+ protocol="IPV4V6"
+ roaming_protocol="IP"
/>
<apn carrier="Tele2 Internet"
@@ -6953,21 +6984,9 @@
apn="sp.telus.com"
type="default,mms,supl"
mmsc="http://aliasredirect.net/proxy/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="54"
- mvno_type="gid"
- />
-
- <apn carrier="TELUS"
- mcc="302"
- mnc="220"
- apn="sp.telus.com"
- type="default,mms,supl"
- mmsc="http://aliasredirect.net/proxy/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="55"
+ mmsproxy="mmscproxy.mobility.ca"
+ mmsport="8799"
+ mvno_match_data="5455"
mvno_type="gid"
/>
@@ -6977,40 +6996,8 @@
apn="isp.telus.com"
server="*"
type="dun"
- protocol="IPV4V6"
- mvno_match_data="54"
- mvno_type="gid"
- />
-
- <apn carrier="TELUS Tether"
- mcc="302"
- mnc="220"
- apn="isp.telus.com"
- server="*"
- type="dun"
- protocol="IPV4V6"
- mvno_match_data="55"
- mvno_type="gid"
- />
-
- <apn carrier="TELUS IMS"
- mcc="302"
- mnc="220"
- apn="ims"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- />
-
- <apn carrier="Koodo"
- mcc="302"
- mnc="220"
- apn="sp.koodo.com"
- type="default,mms,supl,dun"
- mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="4B"
+ protocol="IPV4"
+ mvno_match_data="5455"
mvno_type="gid"
/>
@@ -7020,9 +7007,9 @@
apn="sp.koodo.com"
type="default,mms,supl"
mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="4F"
+ mmsproxy="mmscproxy.mobility.ca"
+ mmsport="8799"
+ mvno_match_data="4B4F"
mvno_type="gid"
/>
@@ -7032,19 +7019,8 @@
apn="sp.koodo.com"
server="*"
type="dun"
- protocol="IPV4V6"
- mvno_match_data="4B"
- mvno_type="gid"
- />
-
- <apn carrier="Koodo Tether"
- mcc="302"
- mnc="220"
- apn="sp.koodo.com"
- server="*"
- type="dun"
- protocol="IPV4V6"
- mvno_match_data="4F"
+ protocol="IPV4"
+ mvno_match_data="4B4F"
mvno_type="gid"
/>
@@ -7054,9 +7030,9 @@
apn="sp.mb.com"
type="default,mms,supl"
mmsc="http://aliasredirect.net/proxy/mb/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="50"
+ mmsproxy="mmscproxy.mobility.ca"
+ mmsport="8799"
+ mvno_match_data="5043"
mvno_type="gid"
/>
@@ -7065,151 +7041,31 @@
mnc="220"
apn="isp.mb.com"
type="dun"
+ protocol="IPV4"
mvno_type="gid"
- mvno_match_data="50"
+ mvno_match_data="5043"
/>
<apn carrier="Mobile Internet"
- mcc="302"
- mnc="220"
- apn="sp.mb.com"
- type="default,mms,agps,supl,fota,hipri"
- mmsc="http://aliasredirect.net/proxy/mb/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_type="gid"
- mvno_match_data="4D4F"
- />
-
- <apn carrier="Tethered Mobile Internet"
mcc="302"
mnc="220"
- apn="isp.mb.com"
- type="dun"
+ apn="sp.mb.com"
+ type="default,mms,agps,supl,fota,hipri"
+ mmsc="http://aliasredirect.net/proxy/mb/mmsc"
+ mmsproxy="mmscproxy.mobility.ca"
+ mmsport="8799"
mvno_type="gid"
mvno_match_data="4D4F"
/>
- <apn carrier="TELUS ISP"
+ <apn carrier="Tethered Mobile Internet"
mcc="302"
mnc="220"
- apn="isp.telus.com"
+ apn="isp.mb.com"
type="dun"
+ protocol="IPV4"
mvno_type="gid"
- mvno_match_data="54"
- />
-
- <apn carrier="TELUS"
- mcc="302"
- mnc="221"
- apn="sp.telus.com"
- type="default,mms,supl"
- mmsc="http://aliasredirect.net/proxy/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="54"
- mvno_type="gid"
- />
-
- <apn carrier="TELUS"
- mcc="302"
- mnc="221"
- apn="sp.telus.com"
- type="default,mms,supl"
- mmsc="http://aliasredirect.net/proxy/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="55"
- mvno_type="gid"
- />
-
- <apn carrier="TELUS Tether"
- mcc="302"
- mnc="221"
- apn="isp.telus.com"
- server="*"
- type="dun"
- protocol="IPV4V6"
- mvno_match_data="54"
- mvno_type="gid"
- />
-
- <apn carrier="TELUS Tether"
- mcc="302"
- mnc="221"
- apn="isp.telus.com"
- server="*"
- type="dun"
- protocol="IPV4V6"
- mvno_match_data="55"
- mvno_type="gid"
- />
-
- <apn carrier="TELUS IMS"
- mcc="302"
- mnc="221"
- apn="ims"
- type="ims"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- />
-
- <apn carrier="Koodo"
- mcc="302"
- mnc="221"
- apn="sp.koodo.com"
- type="default,mms,supl"
- mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="4B"
- mvno_type="gid"
- />
-
- <apn carrier="Koodo"
- mcc="302"
- mnc="221"
- apn="sp.koodo.com"
- type="default,mms,supl"
- mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="4F"
- mvno_type="gid"
- />
-
- <apn carrier="Koodo Tether"
- mcc="302"
- mnc="221"
- apn="sp.koodo.com"
- server="*"
- type="dun"
- protocol="IPV4V6"
- mvno_match_data="4B"
- mvno_type="gid"
- />
-
- <apn carrier="Koodo Tether"
- mcc="302"
- mnc="221"
- apn="sp.koodo.com"
- server="*"
- type="dun"
- protocol="IPV4V6"
- mvno_match_data="4F"
- mvno_type="gid"
- />
-
- <apn carrier="PC mobile"
- mcc="302"
- mnc="221"
- apn="sp.mb.com"
- type="default,mms,supl"
- mmsc="http://aliasredirect.net/proxy/mb/mmsc"
- mmsproxy="74.49.0.18"
- mmsport="80"
- mvno_match_data="50"
- mvno_type="gid"
+ mvno_match_data="4D4F"
/>
<apn carrier="MOWAP"
@@ -16275,6 +16131,20 @@
type="mms"
/>
+ <apn carrier="Be Aliv"
+ mcc="364"
+ mnc="49"
+ apn="pda.newcomobile.com"
+ type="default,supl"
+ />
+
+ <apn carrier="Be Aliv IMS"
+ mcc="364"
+ mnc="49"
+ apn="ims"
+ type="ims"
+ />
+
<apn carrier="Lime Internet Postpaid"
mcc="365"
mnc="84"