apn: Update EE (UK)
mcc: 234
mnc: 30, 33
mnc: remove deprecated 31, 34, 86
* Take FP4 and EE requirements as baseline; align protocols with
requirements.
* mnc=33 partially updated before via separate change
* FP3 doesn't support FP4's "pnn" filtering; instead support EE with
without MVNO data and with gid1 "EE".
* Add 'ia' type APN as per AOSP.
* Leave out 'spn' and network bitmasks for now.
Issue: FP3-A11#405
Change-Id: Ia1a32d72efca80faf6193d293dac4d78f8362ca7
Depends-On: Ia2c01f4e5a14984d46a6d936f7d33b5a6163b878
diff --git a/apns-conf.xml b/apns-conf.xml
index 2db5418..48b5e57 100644
--- a/apns-conf.xml
+++ b/apns-conf.xml
@@ -3286,14 +3286,73 @@
mvno_type="spn"
mvno_match_data="Lycamobile"
/>
- <apn carrier="EE IMS"
+
+ <apn carrier="Internet"
+ mcc="234"
+ mnc="30"
+ apn="everywhere"
+ user="eesecure"
+ password="secure"
+ type="default,ia,supl"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ authtype="1"
+ />
+
+ <apn carrier="IMS"
mcc="234"
mnc="30"
apn="ims"
type="ims"
protocol="IPV4V6"
- roaming_protocol="IPV4V6"
+ authtype="1"
+ user_visible="false"
/>
+
+ <apn carrier="MMS"
+ mcc="234"
+ mnc="30"
+ apn="eezone"
+ user="eesecure"
+ password="secure"
+ mmsc="http://mms/"
+ mmsproxy="149.254.201.135"
+ mmsport="8080"
+ type="mms"
+ authtype="1"
+ />
+
+ <apn carrier="xcap"
+ mcc="234"
+ mnc="30"
+ apn="eezone"
+ user="eesecure"
+ password="secure"
+ type="xcap"
+ authtype="1"
+ user_visible="false"
+ />
+
+ <apn carrier="SOS(wifi)"
+ mcc="234"
+ mnc="30"
+ apn="SOS"
+ type="emergency"
+ protocol="IPV4V6"
+ authtype="1"
+ user_visible="false"
+ />
+
+ <apn carrier="SOS"
+ mcc="234"
+ mnc="30"
+ apn="SOS"
+ type="emergency"
+ protocol="IPV4V6"
+ authtype="1"
+ user_visible="false"
+ />
+
<apn carrier="Virgin Media Mobile Internet"
mcc="234"
mnc="30"
@@ -3306,33 +3365,6 @@
mmsport="8080"
type="default,supl,mms"
/>
- <apn carrier="Internet"
- mcc="234"
- mnc="30"
- apn="everywhere"
- user="eesecure"
- password="secure"
- authtype="1"
- protocol="IP"
- roaming_protocol="IP"
- type="default"
- user_editable="0"
- />
- <apn carrier="MMS"
- mcc="234"
- mnc="30"
- apn="eezone"
- user="eesecure"
- password="secure"
- mmsc="http://mms/"
- mmsproxy="149.254.201.135"
- mmsport="8080"
- authtype="1"
- protocol="IP"
- roaming_protocol="IP"
- type="mms"
- user_editable="0"
- />
<apn carrier="BT One Phone Internet"
mcc="234"
mnc="30"
@@ -3416,33 +3448,90 @@
type="default,supl,mms"
user_editable="false"
/>
- <apn carrier="EE Internet"
+
+ <apn carrier="Internet"
mcc="234"
- mnc="31"
+ mnc="30"
apn="everywhere"
user="eesecure"
password="secure"
+ type="default,ia,supl"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
authtype="1"
- type="default,supl"
+ mvno_type="gid"
+ mvno_match_data="EE"
+ user_editable="false"
/>
- <apn carrier="EE MMS"
+
+ <apn carrier="IMS"
mcc="234"
- mnc="31"
+ mnc="30"
+ apn="ims"
+ type="ims"
+ protocol="IPV4V6"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="EE"
+ user_visible="false"
+ />
+
+ <apn carrier="MMS"
+ mcc="234"
+ mnc="30"
apn="eezone"
user="eesecure"
password="secure"
mmsc="http://mms/"
mmsproxy="149.254.201.135"
mmsport="8080"
- authtype="1"
type="mms"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="EE"
+ user_editable="false"
+ />
+
+ <apn carrier="xcap"
+ mcc="234"
+ mnc="30"
+ apn="eezone"
+ user="eesecure"
+ password="secure"
+ type="xcap"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="EE"
+ user_visible="false"
+ />
+
+ <apn carrier="SOS(wifi)"
+ mcc="234"
+ mnc="30"
+ apn="SOS"
+ type="emergency"
+ protocol="IPV4V6"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="EE"
+ user_visible="false"
+ />
+
+ <apn carrier="SOS"
+ mcc="234"
+ mnc="30"
+ type="emergency"
+ protocol="IPV4V6"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="EE"
+ user_visible="false"
/>
<apn carrier="Internet"
mcc="234"
mnc="33"
apn="everywhere"
- spn="EE"
user="eesecure"
password="secure"
type="default,ia,supl"
@@ -3459,16 +3548,13 @@
type="ims"
protocol="IPV4V6"
authtype="1"
- bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18"
user_visible="false"
- user_editable="false"
/>
<apn carrier="MMS"
mcc="234"
mnc="33"
apn="eezone"
- spn="EE"
user="eesecure"
password="secure"
mmsc="http://mms/"
@@ -3476,7 +3562,6 @@
mmsport="8080"
type="mms"
authtype="1"
- bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18"
user_editable="false"
/>
@@ -3488,31 +3573,52 @@
password="secure"
type="xcap"
authtype="1"
- 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="EE Internet"
+ <apn carrier="Internet"
mcc="234"
- mnc="34"
+ mnc="33"
apn="everywhere"
user="eesecure"
password="secure"
+ type="default,ia,supl"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
authtype="1"
- type="default,supl"
+ mvno_type="gid"
+ mvno_match_data="EE"
+ user_editable="false"
/>
- <apn carrier="EE MMS"
+
+ <apn carrier="IMS"
mcc="234"
- mnc="34"
+ mnc="33"
+ apn="ims"
+ type="ims"
+ protocol="IPV4V6"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="EE"
+ user_visible="false"
+ />
+
+ <apn carrier="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"
+ authtype="1"
+ mvno_type="gid"
+ mvno_match_data="EE"
+ user_editable="false"
/>
+
<apn carrier="Virgin Mobile"
mcc="234"
mnc="38"
@@ -3649,27 +3755,6 @@
password="gprs"
type="default,supl"
/>
- <apn carrier="EE Internet"
- mcc="234"
- mnc="86"
- apn="everywhere"
- user="eesecure"
- password="secure"
- authtype="1"
- type="default,supl"
- />
- <apn carrier="EE MMS"
- mcc="234"
- mnc="86"
- apn="eezone"
- user="eesecure"
- password="secure"
- mmsc="http://mms/"
- mmsproxy="149.254.201.135"
- mmsport="8080"
- authtype="1"
- type="mms"
- />
<apn carrier="3"
mcc="235"