aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-12-05 12:38:06 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2013-12-05 12:38:06 -0800
commitae8f12c1d7f830f700550bfc62e8b196373e0682 (patch)
tree73e4633b6b2d62d0559f8a8e8e2aca47d71ec0e8
parent38da29bfdb291192d823dac006ec9aab09a862c0 (diff)
parent55d8221c140267969d0c21629a594987e12daa0c (diff)
downloadsample-idea133.tar.gz
Merge commit '55d8221c140267969d0c21629a594987e12daa0c' into HEADidea133
Diffstat
-rw-r--r--CleanSpec.mk1
-rw-r--r--etc/apns-conf_verizon.xml12
-rw-r--r--etc/apns-full-conf.xml138
3 files changed, 118 insertions, 33 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..85b7654 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -43,6 +43,7 @@
#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/apns-conf.xml)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/etc/apns-conf_verizon.xml b/etc/apns-conf_verizon.xml
index f48bee7..425777f 100644
--- a/etc/apns-conf_verizon.xml
+++ b/etc/apns-conf_verizon.xml
@@ -51,7 +51,8 @@
mcc="311"
mnc="480"
apn="VZWINTERNET"
- type="default,dun"
+ type="default,mms,dun"
+ mmsc="http://mms.vtext.com/servlets/mms"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="6"
@@ -60,7 +61,8 @@
mcc="311"
mnc="480"
apn="VZWINTERNET"
- type="default,dun"
+ type="default,mms,dun"
+ mmsc="http://mms.vtext.com/servlets/mms"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="7"
@@ -69,7 +71,8 @@
mcc="311"
mnc="480"
apn="VZWINTERNET"
- type="default,dun"
+ type="default,mms,dun"
+ mmsc="http://mms.vtext.com/servlets/mms"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="8"
@@ -78,7 +81,8 @@
mcc="311"
mnc="480"
apn="VZWINTERNET"
- type="default,dun"
+ type="default,mms,dun"
+ mmsc="http://mms.vtext.com/servlets/mms"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
bearer="12"
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 7d61bb0..74d891b 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -1082,7 +1082,7 @@
apn="jazzmms"
user=""
password=""
- mmsc="http://jazztelmms.com/servlets/mms/"
+ mmsc="http://jazztelmms.com/servlets/mms"
mmsproxy="37.132.0.10"
mmsport="8080"
authtype="1"
@@ -1176,7 +1176,7 @@
user=""
password=""
authtype="1"
- mmsc="http://jazztelmms.com/servlets/mms/"
+ mmsc="http://jazztelmms.com/servlets/mms"
mmsproxy="37.132.0.10"
mmsport="8080"
type="mms"
@@ -1960,14 +1960,14 @@
type="mms"
/>
- <apn carrier="GPRS Web"
+ <apn carrier="Internet"
mcc="230"
mnc="03"
apn="internet"
type="default,supl"
/>
- <apn carrier="Vodafone MMS"
+ <apn carrier="MMS"
mcc="230"
mnc="03"
apn="mms"
@@ -3645,6 +3645,8 @@
mnc="03"
apn="internet.tele2.ee"
type="default,supl"
+ mvno_match_data="24803005x"
+ mvno_type="imsi"
/>
<apn carrier="Tele2 MMS"
@@ -3655,6 +3657,41 @@
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"
+ 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="24803000x"
+ mvno_type="imsi"
/>
<apn carrier="MTS Internet"
@@ -5137,13 +5174,12 @@
type="mms"
/>
- <apn carrier="PLAT-OTA-MMS"
+ <apn carrier="PLATMMS"
mcc="310"
mnc="100"
- apn="plateaumms"
- password="mmsc"
- mmsc="208.254.124.11:8514"
- mmsproxy="208.254.124.11"
+ apn="mms.plateau"
+ mmsc="http://mms"
+ mmsproxy="172.23.253.206"
mmsport="8080"
type="mms"
/>
@@ -5151,7 +5187,7 @@
<apn carrier="PLATWEB"
mcc="310"
mnc="100"
- apn="plateauweb"
+ apn="isp.plateau"
type="default,supl"
/>
@@ -5758,7 +5794,7 @@
type="default,supl,mms"
/>
- <apn carrier="Viaero Internet"
+ <apn carrier="Viaero Connect"
mcc="310"
mnc="450"
apn="internet.vedge.com"
@@ -5896,13 +5932,20 @@
type="mms"
/>
- <apn carrier="ChinookMMS"
+ <apn carrier="Cellular One Smartphone"
mcc="310"
mnc="570"
- apn="wapgw.chinookwireless.net"
- mmsc="http://mms.cellonenation.net/mms/"
- mmsproxy="204.181.155.195"
- mmsport="8080"
+ apn="internet"
+ type="default,supl"
+ />
+
+ <apn carrier="Cellular One MMS"
+ mcc="310"
+ mnc="570"
+ apn="clearsky"
+ mmsc="http://mmsc.mtpcs.csky.us:6672/"
+ mmsproxy="209.4.229.229"
+ mmsport="9201"
type="mms"
/>
@@ -6061,7 +6104,7 @@
mnc="770"
apn="wap1.iwireless.com"
mmsc="http://mmsc.iwireless.dataonair.net:6672"
- mmsproxy="209.4.229.32"
+ mmsproxy="209.4.229.31"
mmsport="9401"
type="mms"
/>
@@ -6142,11 +6185,20 @@
type="default,supl,mms"
/>
+ <apn carrier="ISP"
+ mcc="311"
+ mnc="190"
+ apn="isp.cellular1.net"
+ type="default,supl"
+ />
+
<apn carrier="MMS"
mcc="311"
mnc="190"
- apn="wap.cellular1.net"
- mmsc="http://mms.cellular1.net/ecit/mms.php"
+ apn="mms.cellular1.net"
+ mmsc="http://mms.cellular1.net"
+ mmsproxy="10.10.0.97"
+ mmsport="9201"
type="mms"
/>
@@ -6184,6 +6236,27 @@
type="mms"
/>
+ <apn carrier="ACS WEB"
+ mcc="311"
+ mnc="370"
+ apn="web.acs"
+ type="default,supl"
+ mvno_match_data="3113702"
+ mvno_type="imsi"
+ />
+
+ <apn carrier="ACS MMS"
+ mcc="311"
+ mnc="370"
+ apn="mms.acs"
+ mmsc="http://mmsc.acsalaska.net"
+ mmsproxy="209.4.229.92"
+ mmsport="9201"
+ type="mms"
+ mvno_match_data="3113702"
+ mvno_type="imsi"
+ />
+
<apn carrier="INTERNET CLARO"
mcc="330"
mnc="110"
@@ -6769,7 +6842,14 @@
type="mms"
/>
- <apn carrier="Orange net"
+ <apn carrier="Orange Internet (LTE)"
+ mcc="370"
+ mnc="01"
+ apn="orangeinternet"
+ type="ia,default,supl,dun"
+ />
+
+ <apn carrier="Orange net (3G)"
mcc="370"
mnc="01"
apn="orangenet.com.do"
@@ -6819,7 +6899,7 @@
type="mms"
/>
- <apn carrier="Viva Edge"
+ <apn carrier="Viva Edge (GSM)"
mcc="370"
mnc="04"
apn="edge.viva.net.do"
@@ -14643,7 +14723,7 @@
mcc="450"
mnc="05"
apn="lte.sktelecom.com"
- type="ia,default,mms,supl,fota,cbs"
+ type="default,mms,supl,fota,cbs"
mmsc="http://omms.nate.com:9082/oma_mms"
mmsproxy="smart.nate.com"
mmsport="9093"
@@ -14750,7 +14830,7 @@
mcc="450"
mnc="08"
apn="lte150.ktfwing.com"
- type="ia,default,mms,supl,fota,cbs"
+ type="default,mms,supl,fota,cbs"
mmsc="http://mmsc.ktfwing.com:9082"
port="80"
server="*"
@@ -19073,14 +19153,14 @@
type="mms"
/>
- <apn carrier="Kolbi 3G"
+ <apn carrier="KOLBI 3G"
mcc="712"
mnc="01"
apn="kolbi3g"
type="default,supl,dun"
/>
- <apn carrier="Kolbi Multimedia"
+ <apn carrier="Kolbi_Multimedia"
mcc="712"
mnc="01"
apn="kolbimundo"
@@ -19090,14 +19170,14 @@
type="mms"
/>
- <apn carrier="Kolbi 3G"
+ <apn carrier="KOLBI 3G"
mcc="712"
mnc="02"
apn="kolbi3g"
type="default,supl,dun"
/>
- <apn carrier="Kolbi Multimedia"
+ <apn carrier="Kolbi_Multimedia"
mcc="712"
mnc="02"
apn="kolbimundo"
@@ -19192,14 +19272,14 @@
type="default,supl,dun"
/>
- <apn carrier="Wap"
+ <apn carrier="Internet"
mcc="714"
mnc="01"
apn="apn01.cwpanama.com.pa"
type="default,supl,dun"
/>
- <apn carrier="Mms"
+ <apn carrier="MMS"
mcc="714"
mnc="01"
apn="apn02.cwpanama.com.pa"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 17:40:53 +0000