Merge "Updated TELUS and related MVNO APN settings"
diff --git a/apps/SampleEmailPolicy/Android.mk b/apps/SampleEmailPolicy/Android.mk
index 9217018..a8453c1 100644
--- a/apps/SampleEmailPolicy/Android.mk
+++ b/apps/SampleEmailPolicy/Android.mk
@@ -28,6 +28,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := SampleEmailPolicy
+LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 956e831..f0a1364 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -775,13 +775,6 @@
<apn carrier="Px Internet"
mcc="206"
mnc="01"
- apn=""
- type="ia"
- />
-
- <apn carrier="Px Internet"
- mcc="206"
- mnc="01"
apn="INTERNET.PROXIMUS.BE"
type="default,supl"
/>
@@ -791,7 +784,7 @@
mnc="01"
apn="telenetwap.be"
type="default,supl"
- mvno_match_data="2060188"
+ mvno_match_data="20601889"
mvno_type="imsi"
/>
@@ -803,153 +796,10 @@
mmsproxy="195.130.149.100"
mmsport="80"
type="mms"
- mvno_match_data="2060188"
+ mvno_match_data="20601889"
mvno_type="imsi"
/>
- <apn carrier="Virgin mobile"
- mcc="206"
- mnc="01"
- apn="virgin-mobile.fr"
- proxy="10.6.10.1"
- port="8080"
- type="default,supl"
- mvno_match_data="52"
- mvno_type="gid"
- />
-
- <apn carrier="VM MMS"
- mcc="206"
- mnc="01"
- apn="virgin-mobile.fr"
- mmsc="http://virginmms.fr"
- mmsproxy="10.6.10.1"
- mmsport="8080"
- type="mms"
- mvno_match_data="52"
- mvno_type="gid"
- />
-
- <apn carrier="MMS"
- mcc="206"
- mnc="01"
- apn="mms.mobi.eastlink.ca"
- mmsc="http://mmss.mobi.eastlink.ca"
- mmsproxy="10.232.12.49"
- mmsport="8080"
- type="mms"
- mvno_match_data="B6"
- mvno_type="gid"
- />
-
- <apn carrier="Internet"
- mcc="206"
- mnc="01"
- apn="wisp.mobi.eastlink.ca"
- type="default,supl"
- mvno_match_data="B6"
- mvno_type="gid"
- />
-
- <apn carrier="NRJMMS"
- mcc="206"
- mnc="01"
- apn="event.proximus.be"
- authtype="0"
- user="mms"
- password="mms"
- mmsc="http://mmsc.proximus.be/mms"
- mmsproxy="10.55.14.75"
- mmsport="8080"
- type="mms"
- mvno_type="spn"
- mvno_match_data="NRJ Mobile"
- />
-
- <apn carrier="NRJWEB"
- mcc="206"
- mnc="01"
- apn="internet.proximus.be"
- authtype="0"
- type="default,supl,agps,fota,dun"
- mvno_type="spn"
- mvno_match_data="NRJ Mobile"
- />
-
- <apn carrier="MMS"
- mcc="206"
- mnc="01"
- apn="mms.iusacellgsm.mx"
- authtype="0"
- mmsc="http://mms.iusacell3g.com/"
- type="mms"
- user="mmsiusacellgsm"
- password="mmsiusacellgsm"
- mvno_type="spn"
- mvno_match_data="UNEFON"
- />
-
- <apn carrier="MODEM"
- mcc="206"
- mnc="01"
- apn="modem.iusacellgsm.mx"
- authtype="0"
- type="dun"
- user="iusacellgsm"
- password="iusacellgsm"
- mvno_type="spn"
- mvno_match_data="UNEFON"
- />
-
- <apn carrier="Internet"
- mcc="206"
- mnc="01"
- apn="web.iusacellgsm.mx"
- authtype="0"
- type="default"
- user="iusacellgsm"
- password="iusacellgsm"
- mvno_type="spn"
- mvno_match_data="UNEFON"
- />
-
- <apn carrier="MMS"
- mcc="206"
- mnc="01"
- apn="mms.iusacellgsm.mx"
- authtype="0"
- mmsc="http://mms.iusacell3g.com/"
- type="mms"
- user="mmsiusacellgsm"
- password="mmsiusacellgsm"
- mvno_type="spn"
- mvno_match_data="IUSACELL"
- />
-
- <apn carrier="MODEM"
- mcc="206"
- mnc="01"
- apn="modem.iusacellgsm.mx"
- authtype="0"
- type="dun"
- user="iusacellgsm"
- password="iusacellgsm"
- mvno_type="spn"
- mvno_match_data="IUSACELL"
- />
-
- <apn carrier="Internet"
- mcc="206"
- mnc="01"
- apn="web.iusacellgsm.mx"
- authtype="0"
- type="default"
- user="iusacellgsm"
- password="iusacellgsm"
- mvno_type="spn"
- mvno_match_data="IUSACELL"
- />
-
<apn carrier="Telenet Internet"
mcc="206"
mnc="05"
@@ -1720,6 +1570,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"
@@ -3927,6 +3793,8 @@
password="secure"
authtype="1"
type="default,supl"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4"
/>
<apn carrier="EE MMS"
@@ -3940,6 +3808,26 @@
mmsport="8080"
authtype="1"
type="mms"
+ protocol="IPV4"
+ />
+
+ <apn carrier="EE Emergency"
+ mcc="234"
+ mnc="30"
+ apn="SOS"
+ authtype="1"
+ type="Emergency"
+ protocol="IPV6"
+ />
+
+ <apn carrier="EE IMS"
+ mcc="234"
+ mnc="30"
+ apn="ims"
+ authtype="1"
+ type="ims"
+ protocol="IPV6"
+ roaming_protocol="IPV6"
/>
<apn carrier="BT One Phone Internet"
@@ -3966,23 +3854,25 @@
<apn carrier="BT Internet"
mcc="234"
mnc="30"
- apn="btmobile.bt.com"
- user="bt"
- password="bt"
+ apn="everywhere"
+ user="eesecure"
+ password="secure"
authtype="1"
mvno_type="gid"
mvno_match_data="B3"
type="default,supl"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4"
/>
<apn carrier="BT MMS"
mcc="234"
mnc="30"
- apn="mms.bt.com"
- user="bt"
- password="bt"
+ apn="eezone"
+ user="eesecure"
+ password="secure"
authtype="1"
- mmsc="http://MMS/"
+ mmsc="http://mms/"
mmsproxy="149.254.201.135"
mmsport="8080"
mvno_type="gid"
@@ -3990,26 +3880,51 @@
type="mms"
/>
+ <apn carrier="BT Emergency"
+ mcc="234"
+ mnc="30"
+ apn="SOS"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="B3"
+ type="Emergency"
+ protocol="IPV6"
+ />
+
+ <apn carrier="BT IMS"
+ mcc="234"
+ mnc="30"
+ apn="ims"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="B3"
+ type="ims"
+ protocol="IPV6"
+ roaming_protocol="IPV6"
+ />
+
<apn carrier="BT Internet"
mcc="234"
mnc="30"
- apn="btmobile.bt.com"
- user="bt"
- password="bt"
+ apn="everywhere"
+ user="eesecure"
+ password="secure"
authtype="1"
mvno_type="gid"
mvno_match_data="C3"
type="default,supl"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4"
/>
<apn carrier="BT MMS"
mcc="234"
mnc="30"
- apn="mms.bt.com"
- user="bt"
- password="bt"
+ apn="eezone"
+ user="eesecure"
+ password="secure"
authtype="1"
- mmsc="http://MMS/"
+ mmsc="http://mms/"
mmsproxy="149.254.201.135"
mmsport="8080"
mvno_type="gid"
@@ -4017,75 +3932,29 @@
type="mms"
/>
- <apn carrier="EE Internet"
+ <apn carrier="BT Emergency"
mcc="234"
- mnc="31"
- apn="everywhere"
- user="eesecure"
- password="secure"
+ mnc="30"
+ apn="SOS"
authtype="1"
- type="default,supl"
+ mvno_type="gid"
+ mvno_match_data="C3"
+ type="Emergency"
+ protocol="IPV6"
/>
- <apn carrier="EE MMS"
+ <apn carrier="BT IMS"
mcc="234"
- mnc="31"
- apn="eezone"
- user="eesecure"
- password="secure"
- mmsc="http://mms/"
- mmsproxy="149.254.201.135"
- mmsport="8080"
+ mnc="30"
+ apn="ims"
authtype="1"
- type="mms"
+ mvno_type="gid"
+ mvno_match_data="C3"
+ type="ims"
+ protocol="IPV6"
+ roaming_protocol="IPV6"
/>
-
- <apn carrier="EE Internet"
- mcc="234"
- mnc="32"
- apn="everywhere"
- user="eesecure"
- password="secure"
- authtype="1"
- type="default,supl"
- />
-
- <apn carrier="EE MMS"
- mcc="234"
- mnc="32"
- apn="eezone"
- user="eesecure"
- password="secure"
- mmsc="http://mms/"
- mmsproxy="149.254.201.135"
- mmsport="8080"
- authtype="1"
- type="mms"
- />
-
- <apn carrier="EE Internet"
- mcc="234"
- mnc="33"
- apn="everywhere"
- user="eesecure"
- password="secure"
- authtype="1"
- type="default,supl"
- />
-
- <apn carrier="EE MMS"
- mcc="234"
- mnc="33"
- apn="eezone"
- user="eesecure"
- password="secure"
- mmsc="http://mms/"
- mmsproxy="149.254.201.135"
- mmsport="8080"
- authtype="1"
- type="mms"
- />
-
+
<apn carrier="Internet"
mcc="234"
mnc="33"
@@ -4113,7 +3982,7 @@
<apn carrier="EE Internet"
mcc="234"
- mnc="34"
+ mnc="33"
apn="everywhere"
user="eesecure"
password="secure"
@@ -4123,7 +3992,7 @@
<apn carrier="EE MMS"
mcc="234"
- mnc="34"
+ mnc="33"
apn="eezone"
user="eesecure"
password="secure"
@@ -4134,27 +4003,24 @@
type="mms"
/>
- <!--apn carrier="Orange UK 34"
+ <apn carrier="EE Emergency"
mcc="234"
- mnc="34"
- apn="orangeinternet"
- user="user"
- password="pass"
- port="8080"
- type="default"
+ mnc="33"
+ apn="SOS"
+ authtype="1"
+ type="Emergency"
+ protocol="IPV6"
/>
- <apn carrier="Orange UK 34 MMS"
+ <apn carrier="EE IMS"
mcc="234"
- mnc="34"
- apn="orangemms"
- user=""
- password=""
- mmsc="http://mms.orange.co.uk"
- mmsproxy="192.168.224.10"
- mmsport="8080"
- type="mms"
- /-->
+ mnc="33"
+ apn="ims"
+ authtype="1"
+ type="ims"
+ protocol="IPV6"
+ roaming_protocol="IPV6"
+ />
<apn carrier="Truphone"
mcc="234"
@@ -5755,6 +5621,15 @@
type="default,supl"
/>
+ <apn carrier="Tinkoff Mobile"
+ mcc="250"
+ mnc="62"
+ apn="m.tinkoff"
+ user=""
+ password=""
+ type="default,supl"
+ />
+
<apn carrier="Beeline Internet"
mcc="250"
mnc="99"
@@ -30034,10 +29909,10 @@
type="mms"
/>
- <apn carrier="Internet Fulmovil"
+ <apn carrier="Internet Fullmovil"
mcc="712"
mnc="20"
- apn="datos.fulmovil.cr"
+ apn="datos.fullmovil.cr"
type="default,supl"
/>