diff options
author | Vineeta Srivastava <vsrivastava@google.com> | 2014-11-10 22:29:54 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-10 22:29:54 +0000 |
commit | fcd1357b3d1b9095c5ceb4bde44c3da532eb10e2 (patch) | |
tree | 558e99e3d0d612fe1a892a86455b3716c0fdb91f | |
parent | 4ab61b1e979a2976480fcb947cca6e33eccc6973 (diff) | |
parent | b319a829914b6a624e18cebe4b8888b650fedd85 (diff) | |
download | mako-fcd1357b3d1b9095c5ceb4bde44c3da532eb10e2.tar.gz |
Merge "mako: Update APN info additionally reported" into lmp-mr1-dev
-rw-r--r-- | apns-full-conf.xml | 158 | ||||
-rw-r--r-- | overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml | 39 |
2 files changed, 148 insertions, 49 deletions
diff --git a/apns-full-conf.xml b/apns-full-conf.xml index 8b61cc0..8b74d6a 100644 --- a/apns-full-conf.xml +++ b/apns-full-conf.xml @@ -1853,10 +1853,10 @@ type="mms" /> - <apn carrier="YESSS! GPRS" + <apn carrier="Internet" mcc="232" mnc="12" - apn="web.yesss.at" + apn="webapn.at" type="default,supl" /> @@ -2963,16 +2963,14 @@ type="default,supl" /> - <apn carrier="Tele2 Internet" + <apn carrier="TELE2 Internet" mcc="248" mnc="03" apn="internet.tele2.ee" type="default,supl" - mvno_match_data="24803005x" - mvno_type="imsi" /> - <apn carrier="Tele2 MMS" + <apn carrier="TELE2 MMS" mcc="248" mnc="03" apn="mms.tele2.ee" @@ -2980,29 +2978,6 @@ mmsproxy="193.12.40.6" mmsport="8080" type="mms" - mvno_match_data="24803005x" - mvno_type="imsi" - /> - - <apn carrier="Smart/Ultra MMS" - mcc="248" - mnc="03" - apn="internet.tele2.ee" - mmsc="http://mmsc.tele2.ee" - mmsproxy="193.12.40.6" - mmsport="8080" - type="mms" - mvno_match_data="24803005x" - mvno_type="imsi" - /> - - <apn carrier="Tele2 Internet" - mcc="248" - mnc="03" - apn="internet.tele2.ee" - type="default,supl" - mvno_match_data="24803000x" - mvno_type="imsi" /> <apn carrier="Smart/Ultra MMS" @@ -3013,8 +2988,6 @@ mmsproxy="193.12.40.6" mmsport="8080" type="mms" - mvno_match_data="24803000x" - mvno_type="imsi" /> <apn carrier="MTS Internet" @@ -3883,6 +3856,28 @@ type="mms" /> + <apn carrier="T-2" + mcc="293" + mnc="64" + apn="internet.t-2.net" + mmsc="http://www.mms.t-2.net:8002" + mmsproxy="172.20.18.137" + mmsport="8080" + type="default,supl,mms" + /> + + <apn carrier="Telemach Internet" + mcc="293" + mnc="70" + apn="telemach.net" + user="telemach" + password="internet" + mmsc="http://mms.telemach.net:8002" + mmsproxy="91.185.221.85" + mmsport="8080" + type="default,mms" + /> + <apn carrier="T-Mobile MK Internet" mcc="294" mnc="01" @@ -17507,7 +17502,7 @@ type="mms" /> - <apn carrier="TIM Connect" + <apn carrier="TIM CONNECT" mcc="724" mnc="02" apn="timbrasil.br" @@ -17517,10 +17512,10 @@ mmsproxy="200.179.66.242" mmsport="8080" authtype="1" - type="default,supl,mms" + type="default,mms" /> - <apn carrier="TIM Connect" + <apn carrier="TIM CONNECT" mcc="724" mnc="03" apn="timbrasil.br" @@ -17530,10 +17525,10 @@ mmsproxy="200.179.66.242" mmsport="8080" authtype="1" - type="default,supl,mms" + type="default,mms" /> - <apn carrier="TIM Connect" + <apn carrier="TIM CONNECT" mcc="724" mnc="04" apn="timbrasil.br" @@ -17543,7 +17538,7 @@ mmsproxy="200.179.66.242" mmsport="8080" authtype="1" - type="default,supl,mms" + type="default,mms" /> <apn carrier="Java Session" @@ -17552,8 +17547,8 @@ apn="java.claro.com.br" user="claro" password="claro" - authtype="1" - type="default,supl" + authtype="0" + type="default" /> <apn carrier="Claro Foto" @@ -17579,6 +17574,7 @@ mmsproxy="200.142.130.104" mmsport="80" authtype="1" + protocol="IPV4V6" type="mms" /> @@ -17589,7 +17585,8 @@ user="vivo" password="vivo" authtype="1" - type="default,supl" + protocol="IPV4V6" + type="default" /> <apn carrier="SCTL MMS" @@ -17620,7 +17617,9 @@ apn="zap.vivo.com.br" user="vivo" password="vivo" - type="default,supl" + authtype="1" + protocol="IPV4V6" + type="default" /> <apn carrier="Vivo MMS" @@ -17633,6 +17632,7 @@ mmsproxy="200.142.130.104" mmsport="80" authtype="1" + protocol="IPV4V6" type="mms" /> @@ -17646,6 +17646,7 @@ mmsproxy="200.142.130.104" mmsport="80" authtype="1" + protocol="IPV4V6" type="mms" /> @@ -17656,7 +17657,8 @@ user="vivo" password="vivo" authtype="1" - type="default,supl" + protocol="IPV4V6" + type="default" /> @@ -17683,6 +17685,29 @@ type="mms" /> + <apn carrier="Oi GPRS Internet" + mcc="724" + mnc="16" + apn="gprs.oi.com.br" + protocol="IPV4V6" + authtype="0" + type="default" + /> + + <apn carrier="MMS GPRS" + mcc="724" + mnc="16" + apn="mmsgprs.oi.com.br" + user="oimms" + password="oioioi" + mmsc="http://200.222.42.204:8002" + mmsproxy="192.168.10.50" + mmsport="3128" + authtype="1" + protocol="IPV4V6" + type="mms" + /> + <apn carrier="TelemigC GPRS" mcc="724" mnc="19" @@ -17711,10 +17736,10 @@ user="vivo" password="vivo" authtype="1" - type="default,supl" + protocol="IPV4V6" + type="default" /> - <apn carrier="Vivo MMS" mcc="724" mnc="23" @@ -17725,6 +17750,7 @@ mmsproxy="200.142.130.104" mmsport="80" authtype="1" + protocol="IPV4V6" type="mms" /> @@ -17751,27 +17777,61 @@ type="mms" /> - <apn carrier="OI GPRS" + <apn carrier="Oi GPRS Internet" mcc="724" mnc="31" apn="gprs.oi.com.br" - authtype="1" - type="default,supl" + protocol="IPV4V6" + authtype="0" + type="default" /> - <apn carrier="OI MMS" + <apn carrier="MMS GPRS" mcc="724" mnc="31" apn="mmsgprs.oi.com.br" user="oimms" - password="oimms" + password="oioioi" mmsc="http://200.222.42.204:8002" mmsproxy="192.168.10.50" mmsport="3128" authtype="1" + protocol="IPV4V6" type="mms" /> + <apn carrier='Nextel GPS' + mcc='724' + mnc='39' + apn='gps.nextel3g.net.br' + server='http://supl.nextel3g.net.br' + authtype='0' + type='supl' + protocol='IPV4V6' + roaming_protocol='IPV4V6' + /> + + <apn carrier='Nextel MMS' + mcc='724' + mnc='39' + apn='mms.nextel3g.net.br' + authtype='0' + mmsc='http://3gmms.nextel3g.net.br' + mmsproxy='129.192.129.104' + mmsport='8080' + type='mms' + /> + + <apn carrier='Nextel WAP' + mcc='724' + mnc='39' + apn='wap.nextel3g.net.br' + authtype='0' + type='default' + protocol='IPV4V6' + roaming_protocol='IPV4V6' + /> + <apn carrier="Internet Movil" mcc="730" mnc="01" diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml new file mode 100644 index 0000000..d990e17 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> + <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or + <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>1</item> + <item>4</item> + <item>7</item> + <item>9</item> + </integer-array> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string translatable="false" name="config_tether_apndata">Nextel Modem,modem.nextel3g.net.br,,,,,,,,,724,39,0,DUN</string> +</resources> |