commit 51238dac54f6d4667550a75ebebc7b928c03bf27
author Vineeta Srivastava <vsrivastava@google.com> Fri Mar 15 20:54:22 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 15 20:54:22 2013 +0000
tree bacd08cb8375fd0bab193ceeb1d37afe289978cf
parent d5806f9861a2fac1c9d141903bd2179ac098a9ee
parent a4290a20dfb2f34fe9f05ef647c9fabcebf6e831

Merge "Adding Softbank APN for SIM unlocked device for jb-mr1-dev" into jb-mr2-dev

etc/apns-full-conf.xml

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index d175bc0..6d4aee7 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -1952,41 +1952,6 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Internet"
-      mcc="234"
-      mnc="30"
-      apn="everywhere"
-      user="eesecure"
-      password="secure"
-      authtype="1"
-      type="default,supl"
-  />
-
-  <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"
-  />
-
-  <apn carrier="T-Mobile UK"
-      mcc="234"
-      mnc="30"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      mmsc="http://mmsc.t-mobile.co.uk:8002"
-      mmsproxy="149.254.201.135"
-      mmsport="8080"
-      type="default,supl,mms"
-  />
-
   <apn carrier="Virgin Media"
       mcc="234"
       mnc="30"
@@ -1998,49 +1963,76 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="T-Mobile Internet"
+  <apn carrier="EE Internet"
       mcc="234"
-      mnc="31"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      type="default,supl"
+      mnc="30"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
   />
 
-  <apn carrier="T-Mobile Picture Message"
+  <apn carrier="EE MMS"
       mcc="234"
-      mnc="31"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      mmsc="http://mmsc.t-mobile.co.uk:8002"
+      mnc="30"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
       mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="T-Mobile Internet"
+  <apn carrier="EE Internet"
       mcc="234"
-      mnc="32"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      type="default,supl"
+      mnc="31"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
   />
 
-  <apn carrier="T-Mobile Picture Message"
+  <apn carrier="EE MMS"
       mcc="234"
-      mnc="32"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      mmsc="http://mmsc.t-mobile.co.uk:8002"
+      mnc="31"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
       mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="EE Internet"
+      mcc="234"
+      mnc="32"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
+  />
+
+  <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"
@@ -2050,7 +2042,7 @@
       type="default,supl"
   />
 
-  <apn carrier="MMS"
+  <apn carrier="EE MMS"
       mcc="234"
       mnc="33"
       apn="eezone"
@@ -2063,39 +2055,26 @@
       type="mms"
   />
 
-  <apn carrier="Orange Internet"
-      mcc="234"
-      mnc="33"
-      apn="orangeinternet"
-      authtype="2"
-      type="default"
-  />
-
-  <apn carrier="Orange MMS"
-      mcc="234"
-      mnc="33"
-      apn="orangemms"
-      mmsc="http://mms.orange.co.uk/"
-      mmsproxy="192.168.224.10"
-      mmsport="8080"
-      authtype="2"
-      type="mms"
-  />
-
-  <apn carrier="Orange internet"
+  <apn carrier="EE Internet"
       mcc="234"
       mnc="34"
-      apn="orangeinternet"
-      type="default,supl"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="EE MMS"
       mcc="234"
       mnc="34"
-      apn="orangemms"
-      mmsc="http://mms.orange.co.uk/"
-      mmsproxy="192.168.224.10"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -2175,20 +2154,26 @@
       type="default,supl"
   />
 
-  <apn carrier="Orange internet"
+  <apn carrier="EE Internet"
       mcc="234"
       mnc="86"
-      apn="orangeinternet"
-      type="default,supl"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="EE MMS"
       mcc="234"
       mnc="86"
-      apn="orangemms"
-      mmsc="http://mms.orange.co.uk/"
-      mmsproxy="192.168.224.10"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />