Skip to content

Commit dd85719

Browse files
jaoojaoo
committed
Merge pull request mozilla-b2g#9273 from gasolin/issue-863126
Bug 863126 - (REGIONAL) Internet Setting name under Data Settings is inc...
2 parents 73e4f87 + 06c8052 commit dd85719

File tree

5 files changed

+271
-36
lines changed

5 files changed

+271
-36
lines changed

‎shared/resources/apn.json‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,12 +1006,12 @@
10061006
"03": [
10071007
{"carrier":"movistar Internet","apn":"internet.movistar.mx","user":"movistar","password":"movistar","authtype":"1","type":["default","supl","dun"]},
10081008
{"voicemail":"*86","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
1009-
{"carrier":"movistar MMS","apn":"mms.movistar.mx","user":"movistar","password":"movistar","mmsc":"http://mms.movistar.mx","mmsproxy":"10.2.20.1","mmsport":"80","authtype":"1","type":["mms"]}
1009+
{"carrier":"Movistar MMS","apn":"mms.movistar.mx","user":"movistar","password":"movistar","mmsc":"http://mms.movistar.mx","mmsproxy":"10.2.20.1","mmsport":"80","authtype":"1","type":["mms"]}
10101010
],
10111011
"030": [
1012-
{"carrier":"movistar Internet","apn":"internet.movistar.mx","user":"movistar","password":"movistar","authtype":"1","type":["default","supl","dun"]},
1012+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.mx","user":"movistar","password":"movistar","authtype":"1","type":["default","supl","dun"]},
10131013
{"voicemail":"*86","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
1014-
{"carrier":"movistar MMS","apn":"mms.movistar.mx","user":"movistar","password":"movistar","mmsc":"http://mms.movistar.mx","mmsproxy":"10.2.20.1","mmsport":"80","authtype":"1","type":["mms"]}
1014+
{"carrier":"Movistar MMS","apn":"mms.movistar.mx","user":"movistar","password":"movistar","mmsc":"http://mms.movistar.mx","mmsproxy":"10.2.20.1","mmsport":"80","authtype":"1","type":["mms"]}
10151015
],
10161016
"050": [
10171017
{"carrier":"Iusacell Internet","apn":"web.iusacellgsm.mx","user":"Iusacellgsm","password":"Iusacellgsm","authtype":"0","type":["default","supl","dun"]},
@@ -2804,14 +2804,14 @@
28042804
{"carrier":"MMS TIGO","apn":"mms.tigo.gt","user":"","password":"","mmsproxy":"10.16.17.12","mmsport":"8888","mmsc":"http://mms","authtype":"1","type":["mms"]}
28052805
],
28062806
"03": [
2807-
{"carrier":"Internet GT","apn":"internet.movistar.gt","user":"movistargt","password":"movistargt","authtype":"1","type":["default","supl","dun"]},
2807+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.gt","user":"movistargt","password":"movistargt","authtype":"1","type":["default","supl","dun"]},
28082808
{"voicemail":"*86","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
2809-
{"carrier":"MMS2 GPRS","apn":"mms.movistar.gt","user":"movistargt","password":"movistargt","mmsproxy":"10.12.22.1","mmsport":"80","mmsc":"http://mms.movistar.gt","authtype":"1","type":["mms"]}
2809+
{"carrier":"Movistar MMS","apn":"mms.movistar.gt","user":"movistargt","password":"movistargt","mmsproxy":"10.12.22.1","mmsport":"80","mmsc":"http://mms.movistar.gt","authtype":"1","type":["mms"]}
28102810
],
28112811
"030": [
2812-
{"carrier":"Internet GT","apn":"internet.movistar.gt","user":"movistargt","password":"movistargt","authtype":"1","type":["default","supl","dun"]},
2812+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.gt","user":"movistargt","password":"movistargt","authtype":"1","type":["default","supl","dun"]},
28132813
{"voicemail":"*86","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
2814-
{"carrier":"MMS2 GPRS","apn":"mms.movistar.gt","user":"movistargt","password":"movistargt","mmsproxy":"10.12.22.1","mmsport":"80","mmsc":"http://mms.movistar.gt","authtype":"1","type":["mms"]}
2814+
{"carrier":"Movistar MMS","apn":"mms.movistar.gt","user":"movistargt","password":"movistargt","mmsproxy":"10.12.22.1","mmsport":"80","mmsc":"http://mms.movistar.gt","authtype":"1","type":["mms"]}
28152815
]
28162816
},
28172817
"706": {
@@ -2831,14 +2831,14 @@
28312831
{"carrier":"MMS TIGO","apn":"mms.tigo.sv","user":"","password":"","mmsproxy":"10.16.17.12","mmsport":"8888","mmsc":"http://mms","authtype":"1","type":["mms"]}
28322832
],
28332833
"04": [
2834-
{"carrier":"Internet SV","apn":"internet.movistar.sv","user":"movistarsv","password":"movistarsv","authtype":"1","type":["default","supl","dun"]},
2834+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.sv","user":"movistarsv","password":"movistarsv","authtype":"1","type":["default","supl","dun"]},
28352835
{"voicemail":"*86","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
2836-
{"carrier":"MMS2 GPRS","apn":"mms.movistar.sv","user":"movistarsv","password":"movistarsv","mmsproxy":"10.12.20.1","mmsport":"80","mmsc":"http://mms.movistar.sv","authtype":"1","type":["mms"]}
2836+
{"carrier":"Movistar MMS","apn":"mms.movistar.sv","user":"movistarsv","password":"movistarsv","mmsproxy":"10.12.20.1","mmsport":"80","mmsc":"http://mms.movistar.sv","authtype":"1","type":["mms"]}
28372837
],
28382838
"040": [
2839-
{"carrier":"Internet SV","apn":"internet.movistar.sv","user":"movistarsv","password":"movistarsv","authtype":"1","type":["default","supl","dun"]},
2839+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.sv","user":"movistarsv","password":"movistarsv","authtype":"1","type":["default","supl","dun"]},
28402840
{"voicemail":"*86","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
2841-
{"carrier":"MMS2 GPRS","apn":"mms.movistar.sv","user":"movistarsv","password":"movistarsv","mmsproxy":"10.12.20.1","mmsport":"80","mmsc":"http://mms.movistar.sv","authtype":"1","type":["mms"]}
2841+
{"carrier":"Movistar MMS","apn":"mms.movistar.sv","user":"movistarsv","password":"movistarsv","mmsproxy":"10.12.20.1","mmsport":"80","mmsc":"http://mms.movistar.sv","authtype":"1","type":["mms"]}
28422842
]
28432843
},
28442844
"708": {
@@ -2862,9 +2862,9 @@
28622862
{"carrier":"MMS","apn":"mms.emovil","user":"mmsemovil","password":"mmsemovil","mmsproxy":"10.6.32.2","mmsport":"8080","mmsc":"http://10.6.32.27/servlets/mms","authtype":"1","type":["mms"]}
28632863
],
28642864
"300": [
2865-
{"carrier":"Internet GPRS","apn":"internet.movistar.ni","user":"movistarni","password":"movistarni","authtype":"1","type":["default","supl","dun"]},
2865+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.ni","user":"movistarni","password":"movistarni","authtype":"1","type":["default","supl","dun"]},
28662866
{"voicemail":"*86","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
2867-
{"carrier":"movistar MMS","apn":"mms.movistar.ni","user":"movistarni","password":"movistarni","mmsproxy":"10.12.23.1","mmsport":"80","mmsc":"http://mms.movistar.ni","authtype":"1","type":["mms"]}
2867+
{"carrier":"Movistar MMS","apn":"mms.movistar.ni","user":"movistarni","password":"movistarni","mmsproxy":"10.12.23.1","mmsport":"80","mmsc":"http://mms.movistar.ni","authtype":"1","type":["mms"]}
28682868
],
28692869
"730": [
28702870
{"carrier":"INTERNET","apn":"web.emovil","user":"webemovil","password":"webemovil","authtype":"1","type":["default","supl","dun"]},
@@ -2875,21 +2875,23 @@
28752875
"712": {
28762876
"01": [
28772877
{"carrier":"Kolbi","apn":"kolbi3g","user":"","password":"","authtype":"1","type":["default","supl","dun"]},
2878+
{"enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
28782879
{"carrier":"Multimedia","apn":"kolbi3g","user":"","password":"","mmsproxy":"10.184.202.24","mmsport":"8080","mmsc":"http://mmsice","authtype":"1","type":["mms"]}
28792880
],
28802881
"02": [
28812882
{"carrier":"Kolbi","apn":"kolbi3g","user":"","password":"","authtype":"1","type":["default","supl","dun"]},
2883+
{"enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
28822884
{"carrier":"Multimedia","apn":"kolbi3g","user":"","password":"","mmsproxy":"10.184.202.24","mmsport":"8080","mmsc":"http://mmsice","authtype":"1","type":["mms"]}
28832885
],
28842886
"03": [
28852887
{"carrier":"INTERNET CLARO","apn":"internet.ideasclaro","user":"","password":"","authtype":"1","type":["default","supl","dun"]},
2886-
{"voicemail":"190","type":["operatorvariant"]},
2888+
{"voicemail":"190","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
28872889
{"carrier":"MMS CLARO","apn":"mms.ideasclaro","user":"","password":"","mmsproxy":"216.230.133.66","mmsport":"8080","mmsc":"http://mms.ideasclaro.com:8002","authtype":"1","type":["mms"]}
28882890
],
28892891
"04": [
2890-
{"carrier":"movistar INTERNET","apn":"internet.movistar.cr","user":"movistarcr","password":"movistarcr","authtype":"1","type":["default","supl","dun"]},
2892+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.cr","user":"movistarcr","password":"movistarcr","authtype":"1","type":["default","supl","dun"]},
28912893
{"voicemail":"*1960","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
2892-
{"carrier":"movistar MMS","apn":"mms.movistar.cr","user":"movistarcr","password":"movistarcr","mmsproxy":"10.221.79.83","mmsport":"80","mmsc":"http://mms.movistar.cr","authtype":"1","type":["mms"]}
2894+
{"carrier":"Movistar MMS","apn":"mms.movistar.cr","user":"movistarcr","password":"movistarcr","mmsproxy":"10.221.79.83","mmsport":"80","mmsc":"http://mms.movistar.cr","authtype":"1","type":["mms"]}
28932895
]
28942896
},
28952897
"714": {
@@ -2899,9 +2901,9 @@
28992901
{"carrier":"Mms","apn":"apn02.cwpanama.com.pa","user":"","password":"","mmsproxy":"172.25.3.5","mmsport":"8080","mmsc":"http://mms.zonamovil.com.pa","authtype":"1","type":["mms"]}
29002902
],
29012903
"020": [
2902-
{"carrier":"movistar INTERNET","apn":"internet.movistar.pa","user":"movistarpa","password":"movistarpa","authtype":"1","type":["default","supl","dun"]},
2904+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.pa","user":"movistarpa","password":"movistarpa","authtype":"1","type":["default","supl","dun"]},
29032905
{"voicemail":"*86","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
2904-
{"carrier":"movistar MMS","apn":"mms.movistar.pa","user":"movistarpamms","password":"movistarpa","mmsproxy":"10.12.21.1","mmsport":"80","mmsc":"http://mms.movistar.pa","authtype":"1","type":["mms"]}
2906+
{"carrier":"Movistar MMS","apn":"mms.movistar.pa","user":"movistarpamms","password":"movistarpa","mmsproxy":"10.12.21.1","mmsport":"80","mmsc":"http://mms.movistar.pa","authtype":"1","type":["mms"]}
29052907
],
29062908
"03": [
29072909
{"carrier":"WEB Claro","apn":"web.claro.com.pa","user":"CLAROWEB","password":"CLAROWEB","authtype":"1","type":["default","supl","dun"]},
@@ -2921,9 +2923,9 @@
29212923
{"carrier":"CLARO MMS","apn":"mms.claro.pe","user":"claro","password":"claro","mmsproxy":"192.168.231.30","mmsport":"80","mmsc":"http://claro/servlets/mms","authtype":"1","type":["mms"]}
29222924
],
29232925
"06": [
2924-
{"carrier":"movistar Internet","apn":"movistar.pe","user":"movistar@datos","password":"movistar","authtype":"1","type":["default","supl","dun"]},
2926+
{"carrier":"Movistar INTERNET","apn":"movistar.pe","user":"movistar@datos","password":"movistar","authtype":"1","type":["default","supl","dun"]},
29252927
{"voicemail":"*169","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
2926-
{"carrier":"movistar MMS","apn":"mms.movistar.pe","user":"movistar@mms","password":"movistar","mmsproxy":"200.4.196.118","mmsport":"8080","mmsc":"http://mmsc.telefonicamovistar.com.pe:8088/mms/","authtype":"1","type":["mms"]}
2928+
{"carrier":"Movistar MMS","apn":"mms.movistar.pe","user":"movistar@mms","password":"movistar","mmsproxy":"200.4.196.118","mmsport":"8080","mmsc":"http://mmsc.telefonicamovistar.com.pe:8088/mms/","authtype":"1","type":["mms"]}
29272929
]
29282930
},
29292931
"722": {
@@ -2948,7 +2950,7 @@
29482950
{"carrier":"Personal MMS","apn":"mms","user":"mms","password":"mms","mmsproxy":"172.25.7.31","mmsport":"8080","mmsc":"http://mms.personal.com","authtype":"1","type":["mms"]}
29492951
],
29502952
"07": [
2951-
{"carrier":"Movistar Emoción","apn":"wap.gprs.unifon.com.ar","user":"wap","password":"wap","proxy":"200.5.68.10","port":"8080","authtype":"1","type":["default","supl","dun"]},
2953+
{"carrier":"Movistar WAP","apn":"wap.gprs.unifon.com.ar","user":"wap","password":"wap","proxy":"200.5.68.10","port":"8080","authtype":"1","type":["default","supl","dun"]},
29522954
{"voicemail":"555","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
29532955
{"carrier":"Movistar MMS","apn":"mms.gprs.unifon.com.ar","user":"mms","password":"mms","mmsproxy":"200.68.32.239","mmsport":"8080","mmsc":"http://mms.movistar.com.ar","authtype":"1","type":["mms"]}
29542956
]
@@ -3031,9 +3033,9 @@
30313033
{"carrier":"MMS Entel","apn":"mms.entelpcs.cl","user":"entelpcs","password":"entelpcs","mmsproxy":"10.99.0.10","mmsport":"8080","mmsc":"http://mmsc.entelpcs.cl","authtype":"1","type":["mms"]}
30323034
],
30333035
"02": [
3034-
{"carrier":"NEM","apn":"wap.tmovil.cl","proxy":"172.17.8.11","port":"8080","user":"wap","password":"wap","authtype":"1","type":["default","supl","dun"]},
3036+
{"carrier":"Movistar APLICACIONES","apn":"wap.tmovil.cl","proxy":"172.17.8.11","port":"8080","user":"wap","password":"wap","authtype":"1","type":["default","supl","dun"]},
30353037
{"voicemail":"500","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
3036-
{"carrier":"MMS","apn":"mms.tmovil.cl","user":"mms","password":"mms","mmsproxy":"172.17.8.10","mmsport":"8080","mmsc":"http://mms.movistar.cl","authtype":"1","type":["mms"]}
3038+
{"carrier":"Movistar MMS","apn":"mms.tmovil.cl","user":"mms","password":"mms","mmsproxy":"172.17.8.10","mmsport":"8080","mmsc":"http://mms.movistar.cl","authtype":"1","type":["mms"]}
30373039
],
30383040
"03": [
30393041
{"carrier":"BAM Claro","apn":"bam.clarochile.cl","user":"clarochile","password":"clarochile","authtype":"1","type":["default","supl","dun"]},
@@ -3069,9 +3071,9 @@
30693071
{"carrier":"TIGO Multimedia","apn":"mms.colombiamovil.com.co","user":"mms-cm1900","password":"mms-cm1900","mmsproxy":"190.102.206.48","mmsport":"8080","mmsc":"http://mms.ola.com.co","authtype":"1","type":["mms"]}
30703072
],
30713073
"123": [
3072-
{"carrier":"movistar INTERNET","apn":"internet.movistar.com.co","user":"movistar","password":"movistar","authtype":"1","type":["default","supl","dun"]},
3074+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.com.co","user":"movistar","password":"movistar","authtype":"1","type":["default","supl","dun"]},
30733075
{"voicemail":"*123","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
3074-
{"carrier":"movistar MMS","apn":"mms.movistar.com.co","user":"movistar","password":"movistar","mmsproxy":"192.168.222.7","mmsport":"9001","mmsc":"http://mms.movistar.com.co","authtype":"1","type":["mms"]}
3076+
{"carrier":"Movistar MMS","apn":"mms.movistar.com.co","user":"movistar","password":"movistar","mmsproxy":"192.168.222.7","mmsport":"9001","mmsc":"http://mms.movistar.com.co","authtype":"1","type":["mms"]}
30753077
]
30763078
},
30773079
"734": {
@@ -3091,10 +3093,10 @@
30913093
{"carrier":"MMS","apn":"expresate.digitel.ve","mmsproxy":"10.99.0.10","mmsport":"8080","mmsc":"http://mms.412.com.ve/servlets/mms","authtype":"1","type":["mms"]}
30923094
],
30933095
"04": [
3094-
{"carrier":"movistar INTERNET","apn":"internet.movistar.ve","authtype":"1","type":["default","supl","dun"]},
3096+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.ve","authtype":"1","type":["default","supl","dun"]},
30953097
{"voicemail":"*2","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
3096-
{"carrier":"movistar MMS","apn":"mms.movistar.ve","mmsproxy":"200.35.64.73","mmsport":"9001","mmsc":"http://mms.movistar.com.ve:8088/mms","authtype":"1","type":["mms"]},
3097-
{"carrier":"movistar WAP","apn":"wap.movistar.ve","mmsproxy":"200.35.64.73","mmsport":"9001","authtype":"1","type":["default","supl","dun"]}
3098+
{"carrier":"Movistar MMS","apn":"mms.movistar.ve","mmsproxy":"200.35.64.73","mmsport":"9001","mmsc":"http://mms.movistar.com.ve:8088/mms","authtype":"1","type":["mms"]},
3099+
{"carrier":"Movistar WAP","apn":"wap.movistar.ve","mmsproxy":"200.35.64.73","mmsport":"9001","authtype":"1","type":["default","supl","dun"]}
30983100
],
30993101
"06": [
31003102
{"carrier":"MODEM","apn":"int.movilnet.com.ve","authtype":"1","type":["default","supl","dun"]},
@@ -3118,9 +3120,9 @@
31183120
},
31193121
"740": {
31203122
"00": [
3121-
{"carrier":"movistar INTERNET","apn":"internet.movistar.com.ec","user":"movistar","password":"movistar","authtype":"1","type":["default","supl","dun"]},
3123+
{"carrier":"Movistar INTERNET","apn":"internet.movistar.com.ec","user":"movistar","password":"movistar","authtype":"1","type":["default","supl","dun"]},
31223124
{"voicemail":"*82","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
3123-
{"carrier":"movistar MMS","apn":"mms.movistar.com.ec","user":"movistar","password":"movistar","mmsproxy":"10.3.5.50","mmsport":"9001","mmsc":"http://mms.movistar.com.ec:8088/mms/","authtype":"1","type":["mms"]}
3125+
{"carrier":"Movistar MMS","apn":"mms.movistar.com.ec","user":"movistar","password":"movistar","mmsproxy":"10.3.5.50","mmsport":"9001","mmsc":"http://mms.movistar.com.ec:8088/mms/","authtype":"1","type":["mms"]}
31243126
],
31253127
"01": [
31263128
{"carrier":"Claro Internet","apn":"internet.porta.com.ec","user":"","password":"","authtype":"1","type":["default","supl","dun"]},
@@ -3169,9 +3171,9 @@
31693171
{"carrier":"gprsANCEL","apn":"gprs.ancel","authtype":"1","type":["default","supl","dun"]}
31703172
],
31713173
"07": [
3172-
{"carrier":"Movistar Emoción","apn":"webapn.movistar.com.uy","user":"movistar","password":"movistar","authtype":"1","type":["default","supl","dun"]},
3174+
{"carrier":"Movistar INTERNET","apn":"webapn.movistar.com.uy","user":"movistar","password":"movistar","authtype":"1","type":["default","supl","dun"]},
31733175
{"voicemail":"6684","enableStrict7BitEncodingForSms":true,"type":["operatorvariant"]},
3174-
{"carrier":"FOTOS MMS","apn":"apnmms.movistar.com.uy","user":"mmsuy","password":"mmsuy","mmsproxy":"10.0.2.29","mmsport":"8080","mmsc":"http://mmsc.movistar.com.uy","authtype":"1","type":["mms"]}
3176+
{"carrier":"Movistar MMS","apn":"apnmms.movistar.com.uy","user":"mmsuy","password":"mmsuy","mmsproxy":"10.0.2.29","mmsport":"8080","mmsc":"http://mmsc.movistar.com.uy","authtype":"1","type":["mms"]}
31753177
]
31763178
}
3177-
}
3179+
}

‎shared/resources/apn/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ These files are only used to test and merge these APN databases.
1010

1111
The `/shared/resources/apn.json` file is a JSON version of the Android database, with a few additional informations from the Gnome APN database (e.g. voicemail number).
1212

13-
To regenerate the .json file, start from the parent directory a webserver. Like this:
13+
To regenerate the .json file, delete the apn.json first, then start a webserver from gaia/shared/resource folder. Like this:
1414

15-
cd .. ; python -m SimpleHTTPServer 4104
15+
python -m SimpleHTTPServer 4104
1616

1717
Then load http://0.0.0.0:4104/apn
1818
This should regenerate the .json file into the left part of the page, and you can cut & paste this to your editor.

0 commit comments

Comments
 (0)