Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 15f09d20: am 33c34d6c: am 9a53c113: Merge "telephony: Change string to string-array config_tether_apndata to support mvno" into lmp-mr1-dev

Browse Source 
* commit '15f09d20311278fc73c477cd45400e41965dd05f':
  telephony: Change string to string-array config_tether_apndata to support mvno
This commit is contained in:
Robert Greenwalt
2014-11-18 02:31:27 +00:00
committed by Android Git Automerger
parent 1fdb441d43 15f09d2031
commit 699e2fe264
19 changed files with 86 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/res/values-mcc202-mnc05/config.xml
View File

@@ -33,8 +33,11 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">Vf Tethering,internet.vodafone.gr,,,,,,,,,202,05,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Vf Tethering,internet.vodafone.gr,,,,,,,,,202,05,,DUN</item>
</string-array>
</resources>

7
core/res/res/values-mcc208-mnc10/config.xml
View File

@@ -31,9 +31,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">SFR option modem,websfr,,,,,,,,,208,10,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>SFR option modem,websfr,,,,,,,,,208,10,,DUN</item>
</string-array>
<string-array translatable="false" name="config_operatorConsideredNonRoaming">
<item>21401</item>

7
core/res/res/values-mcc214-mnc01/config.xml
View File

@@ -33,9 +33,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</item>
</string-array>
<string-array translatable="false" name="config_operatorConsideredNonRoaming">
<item>21402</item>

4
core/res/res/values-mcc214-mnc07/config.xml
View File

@@ -35,6 +35,8 @@
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">Conexion Compartida,movistar.es,,,MOVISTAR,MOVISTAR,,,,,214,07,1,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Conexion Compartida,movistar.es,,,MOVISTAR,MOVISTAR,,,,,214,07,1,DUN</item>
</string-array>
</resources>

7
core/res/res/values-mcc222-mnc10/config.xml
View File

@@ -32,9 +32,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</item>
</string-array>
<string-array translatable="false" name="config_operatorConsideredNonRoaming">
<item>21401</item>

4
core/res/res/values-mcc234-mnc20/config.xml
View File

@@ -35,7 +35,9 @@
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">3hotspot,3hotspot,,,,,,,,,234,20,0,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>3hotspot,3hotspot,,,,,,,,,234,20,0,DUN</item>
</string-array>
<!-- Configure mobile network MTU. Carrier specific value is set here.
-->

4
core/res/res/values-mcc235-mnc94/config.xml
View File

@@ -35,7 +35,9 @@
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">3hotspot,3hotspot,,,,,,,,,235,94,0,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>3hotspot,3hotspot,,,,,,,,,235,94,0,DUN</item>
</string-array>
<!-- Configure mobile network MTU. Carrier specific value is set here.
-->

8
core/res/res/values-mcc268-mnc03/config.xml
View File

@@ -33,8 +33,10 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,270,,DUN" -->
<string translatable="false" name="config_tether_apndata">Optimus HotSpot,modem,,,,,,,,,268,03,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Optimus HotSpot,modem,,,,,,,,,268,03,,DUN</item>
</string-array>
</resources>

7
core/res/res/values-mcc302-mnc370/config.xml
View File

@@ -32,9 +32,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">Fido LTE Tethering,ltedata.apn,,,,,,,,,302,370,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Fido LTE Tethering,ltedata.apn,,,,,,,,,302,370,,DUN</item>
</string-array>
<!-- Configure mobile network MTU. Carrier specific value is set here.
-->

7
core/res/res/values-mcc302-mnc660/config.xml
View File

@@ -32,9 +32,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">MTS -Tethering,internet.mts,,,,,,,,,302,660,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>MTS -Tethering,internet.mts,,,,,,,,,302,660,,DUN</item>
</string-array>
<!-- Configure mobile network MTU. Carrier specific value is set here.
-->

7
core/res/res/values-mcc302-mnc720/config.xml
View File

@@ -32,9 +32,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">Rogers LTE Tethering,ltedata.apn,,,,,,,,,302,720,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Rogers LTE Tethering,ltedata.apn,,,,,,,,,302,720,,DUN</item>
</string-array>
<!-- Configure mobile network MTU. Carrier specific value is set here.
-->

7
core/res/res/values-mcc302-mnc780/config.xml
View File

@@ -33,9 +33,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">SaskTel Tethering,inet.stm.sk.ca,,,,,,,,,302,780,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>SaskTel Tethering,inet.stm.sk.ca,,,,,,,,,302,780,,DUN</item>
</string-array>
<!-- Don't use roaming icon for considered operators -->
<string-array translatable="false" name="config_operatorConsideredNonRoaming">

4
core/res/res/values-mcc311-mnc190/config.xml
View File

@@ -35,6 +35,8 @@
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">Tether,broadband.cellular1.net,,,,,,,,,311,190,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Tether,broadband.cellular1.net,,,,,,,,,311,190,,DUN</item>
</string-array>
</resources>

7
core/res/res/values-mcc334-mnc050/config.xml
View File

@@ -33,8 +33,11 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">Modem,modem.iusacellgsm.mx,,,iusacellgsm,iusacellgsm,,,,,334,050,1,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Modem,modem.iusacellgsm.mx,,,iusacellgsm,iusacellgsm,,,,,334,050,1,DUN</item>
</string-array>
</resources>

7
core/res/res/values-mcc340-mnc01/config.xml
View File

@@ -32,9 +32,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">Orangeweb,orangeweb,,,orange,orange,,,,,340,01,1,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Orangeweb,orangeweb,,,orange,orange,,,,,340,01,1,DUN</item>
</string-array>
<string-array translatable="false" name="config_operatorConsideredNonRoaming">
<item>20801</item>

7
core/res/res/values-mcc425-mnc07/config.xml
View File

@@ -33,9 +33,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">PC HOT mobile,pc.hotm,,,,,,,,,425,07,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>PC HOT mobile,pc.hotm,,,,,,,,,425,07,,DUN</item>
</string-array>
<!-- Don't use roaming icon for considered operators -->
<string-array translatable="false" name="config_operatorConsideredNonRoaming">

7
core/res/res/values-mcc505-mnc01/config.xml
View File

@@ -33,9 +33,12 @@
<!-- 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"
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">Telstra Tethering,telstra.internet,,,,,,,,,505,01,,DUN</string>
<string-array translatable="false" name="config_tether_apndata">
<item>Telstra Tethering,telstra.internet,,,,,,,,,505,01,,DUN</item>
</string-array>
<!-- Configure mobile network MTU. Carrier specific value is set here.
-->

11
core/res/res/values/config.xml
View File

@@ -323,9 +323,14 @@
<!-- 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"></string>
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
Or string format of ApnSettingV3.
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN"
Multiple entries are separated by using string-array:
"<item>[ApnSettingV3]Name,apn,,,,,,,,,123,45,,mms|*,IPV6,IP,true,14,,,,,,,spn,testspn</item>
<item>[ApnSettingV3]Name1,apn2,,,,,,,,,123,46,,mms|*,IPV6,IP,true,12,,,,,,,,</item>" -->
<string-array translatable="false" name="config_tether_apndata">
</string-array>
<!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
<bool translatable="false" name="config_wifi_dual_band_support">false</bool>

2
core/res/res/values/symbols.xml
View File

@@ -538,7 +538,6 @@
<java-symbol type="string" name="config_mms_user_agent" />
<java-symbol type="string" name="config_mms_user_agent_profile_url" />
<java-symbol type="string" name="config_ntpServer" />
<java-symbol type="string" name="config_tether_apndata" />
<java-symbol type="string" name="config_useragentprofile_url" />
<java-symbol type="string" name="config_wifi_p2p_device_type" />
<java-symbol type="string" name="contentServiceSync" />
@@ -1552,6 +1551,7 @@
<java-symbol type="array" name="config_tether_bluetooth_regexs" />
<java-symbol type="array" name="config_tether_dhcp_range" />
<java-symbol type="array" name="config_tether_upstream_types" />
<java-symbol type="array" name="config_tether_apndata" />
<java-symbol type="array" name="config_tether_usb_regexs" />
<java-symbol type="array" name="config_tether_wifi_regexs" />
<java-symbol type="array" name="config_usbHostBlacklist" />