commit 58308e1a30f349e01ac4faff4e4fed8d9d5a1adb
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 12 17:06:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 12 17:06:07 2018 +0000
tree dcbd74b6d38f02c21669b7bb4da01cc3105833eb
parent 6b74a96e93d06d75cba7d1fbefcd37af83d62469
parent c4b469b897771154baec3a95257d839516b12dd2

Merge "APN changes requested by EE"

etc/apns-full-conf.xml

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 3f0f243..76edc39 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -3927,6 +3927,8 @@
       password="secure"
       authtype="1"
       type="default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
   />
 
   <apn carrier="EE MMS"
@@ -3940,6 +3942,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 +3988,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 +4014,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 +4066,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 +4116,7 @@
 
   <apn carrier="EE Internet"
       mcc="234"
-      mnc="34"
+      mnc="33"
       apn="everywhere"
       user="eesecure"
       password="secure"
@@ -4123,7 +4126,7 @@
 
   <apn carrier="EE MMS"
       mcc="234"
-      mnc="34"
+      mnc="33"
       apn="eezone"
       user="eesecure"
       password="secure"
@@ -4134,27 +4137,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"