apn: Update O2 UK and MVNOs
mcc: 234
mnc: 10, 11, drop 02
Update as per Telefónica specs and FP4 as reference:
* Drop old mnc02
* Update O2 (UK), Tesco, giffgaff, Manx, Talk Talk
* Update MVNO match for giffgaff from spn to gid
* Keep old mnc11 as per AOSP
* Add type 'ia' APN as per AOSP
Issue: FP3-A11#439
Change-Id: I5976c6b4ed12b9f52b1a104437c1ec46f2c589ed
diff --git a/apns-conf.xml b/apns-conf.xml
index 48bf7b8..fc45781 100644
--- a/apns-conf.xml
+++ b/apns-conf.xml
@@ -2909,36 +2909,6 @@
apn="internet"
type="default,supl,mms"
/>
- <apn carrier="O2 MOBILE WEB"
- mcc="234"
- mnc="02"
- apn="mobile.o2.co.uk"
- user="O2web"
- password="O2web"
- type="default,supl"
- />
- <apn carrier="O2 MMS Prepay"
- mcc="234"
- mnc="02"
- apn="payandgo.o2.co.uk"
- user="payandgo"
- password="password"
- mmsc="http://mmsc.mms.o2.co.uk:8002"
- mmsproxy="82.132.254.1"
- mmsport="8080"
- type="mms"
- />
- <apn carrier="O2 MMS Postpay"
- mcc="234"
- mnc="02"
- apn="wap.o2.co.uk"
- user="o2wap"
- password="password"
- mmsc="http://mmsc.mms.o2.co.uk:8002"
- mmsproxy="82.132.254.1"
- mmsport="8080"
- type="mms"
- />
<apn carrier="BT One Phone Internet"
mcc="234"
mnc="08"
@@ -2958,104 +2928,178 @@
mvno_match_data="B2"
type="mms"
/>
- <apn carrier="O2 Mobile Web"
+
+ <apn carrier="O2 Pay Monthly"
mcc="234"
mnc="10"
apn="mobile.o2.co.uk"
- user="o2web"
- password="password"
- type="default,supl"
+ spn="O2 - UK [postpay]"
+ user="o2"
+ password="p"
+ mmsc="http://mmsc.mms.o2.co.uk:8002"
+ type="default,ia,supl,mms,xcap"
+ protocol="IPV4V6"
+ authtype="1"
/>
- <apn carrier="O2 MMS"
+
+ <apn carrier="IMS"
mcc="234"
mnc="10"
- apn="wap.o2.co.uk"
- user="o2wap"
- password="password"
- proxy="193.113.200.195"
- port="8080"
- mmsc="http://mmsc.mms.o2.co.uk:8002"
- mmsproxy="82.132.254.1"
- mmsport="8080"
- type="mms"
+ apn="ims"
+ type="ims"
+ protocol="IPV4V6"
+ bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18"
+ user_visible="false"
/>
- <apn carrier="O2 PREPAY"
- mcc="234"
- mnc="10"
- apn="payandgo.o2.co.uk"
- proxy="193.113.200.195"
- port="8080"
- user="payandgo"
- password="password"
- mmsc="http://mmsc.mms.o2.co.uk:8002"
- mmsproxy="82.132.254.1"
- mmsport="8080"
- type="default,supl,mms"
- />
- <apn carrier="TESCO"
+
+ <apn carrier="TESCO"
mcc="234"
mnc="10"
apn="prepay.tesco-mobile.com"
- user="tescowap"
- password="password"
- mmsc="http://mmsc.mms.o2.co.uk:8002"
- mmsproxy="82.132.254.1"
- mmsport="8080"
- type="default,supl,mms"
- mvno_match_data="0A"
+ spn="TESCO"
+ user="tm"
+ password="p"
+ type="default,ia,supl"
+ protocol="IPV4V6"
+ authtype="1"
mvno_type="gid"
+ mvno_match_data="0a"
/>
+
+ <apn carrier="IMS"
+ mcc="234"
+ mnc="10"
+ apn="ims"
+ type="ims"
+ protocol="IPV4V6"
+ authtype="0"
+ bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18"
+ mvno_type="gid"
+ mvno_match_data="0a"
+ user_visible="false"
+ user_editable="false"
+ />
+
+ <apn carrier="Tesco Mobile"
+ mcc="234"
+ mnc="10"
+ apn="prepay.tesco-mobile.com"
+ mmsc="http://mmsc.mms.o2.co.uk:8002"
+ type="mms"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="0a"
+ />
+
<apn carrier="giffgaff"
mcc="234"
mnc="10"
apn="giffgaff.com"
- authtype="1"
- user="giffgaff"
+ spn="giffgaff"
+ user="gg"
+ password="p"
mmsc="http://mmsc.mediamessaging.co.uk:8002"
- mmsproxy="82.132.254.1"
- mmsport="8080"
- type="default,supl,mms"
- mvno_type="spn"
- mvno_match_data="giffgaff"
+ type="default,ia,supl,mms"
+ protocol="IPV4V6"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="508"
/>
- <apn carrier="O2 MOBILE WEB"
+
+ <apn carrier="Manx"
mcc="234"
- mnc="11"
- apn="mobile.o2.co.uk"
- user="O2web"
- password="O2web"
- type="default,supl"
+ mnc="10"
+ apn="internet"
+ type="default,ia"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="519"
/>
- <apn carrier="O2 MMS Prepay"
+
+ <apn carrier="TalkTalk"
mcc="234"
- mnc="11"
+ mnc="10"
+ apn="mobile.talktalk.co.uk"
+ spn="TalkTalk"
+ mmsc="http://mms.talktalk.co.uk/servlets/mms"
+ mmsproxy="212.183.137.12"
+ mmsport="8799"
+ type="default,ia,supl,mms"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="537"
+ user_editable="false"
+ />
+
+ <apn carrier="O2 Pay As You Go"
+ mcc="234"
+ mnc="10"
apn="payandgo.o2.co.uk"
- user="payandgo"
- password="password"
+ spn="O2 - UK [prepay]"
+ user="o2"
+ password="p"
mmsc="http://mmsc.mms.o2.co.uk:8002"
- mmsproxy="82.132.254.1"
- mmsport="8080"
- type="mms"
+ type="default,ia,supl,mms"
+ protocol="IPV4V6"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="61"
/>
- <apn carrier="O2 MMS Postpay"
+
+ <apn carrier="O2 Pay As You Go"
mcc="234"
- mnc="11"
- apn="wap.o2.co.uk"
- user="o2wap"
- password="password"
+ mnc="10"
+ apn="payandgo.o2.co.uk"
+ spn="O2 - UK [prepay]"
+ user="o2"
+ password="p"
mmsc="http://mmsc.mms.o2.co.uk:8002"
- mmsproxy="82.132.254.1"
- mmsport="8080"
- type="mms"
+ type="default,ia,supl,mms"
+ protocol="IPV4V6"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="67"
/>
- <apn carrier="O2 MOBILE WEB"
+
+ <apn carrier="O2 Pay As You Go"
+ mcc="234"
+ mnc="10"
+ apn="payandgo.o2.co.uk"
+ spn="O2 - UK [prepay]"
+ user="o2"
+ password="p"
+ mmsc="http://mmsc.mms.o2.co.uk:8002"
+ type="default,ia,supl,mms"
+ protocol="IPV4V6"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="85"
+ />
+
+ <apn carrier="O2 Pay As You Go"
+ mcc="234"
+ mnc="10"
+ apn="payandgo.o2.co.uk"
+ spn="O2 - UK [prepay]"
+ user="o2"
+ password="p"
+ mmsc="http://mmsc.mms.o2.co.uk:8002"
+ type="default,ia,supl,mms"
+ protocol="IPV4V6"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="99"
+ />
+
+ <apn carrier="O2 Mobile Web"
mcc="234"
mnc="11"
apn="mobile.o2.co.uk"
user="O2web"
password="O2web"
- type="default,supl"
+ type="default,ia,supl"
/>
+
<apn carrier="O2 MMS Prepay"
mcc="234"
mnc="11"
@@ -3067,6 +3111,7 @@
mmsport="8080"
type="mms"
/>
+
<apn carrier="O2 MMS Postpay"
mcc="234"
mnc="11"