diff options
author | Sungmin Choi <sungmin.choi@lge.com> | 2013-12-13 13:30:44 +0900 |
---|---|---|
committer | Robert Greenwalt <rgreenwalt@google.com> | 2014-11-10 16:37:30 -0800 |
commit | 767461e509abbf0e0b0039256b87840f3fce36be (patch) | |
tree | 92541111c40d7a394053d4aa3f59c6136694fe0a | |
parent | 993e3d2d40cbd95d78cd3d2a76c77af2f4ab0e88 (diff) | |
download | frameworks_base-767461e509abbf0e0b0039256b87840f3fce36be.zip frameworks_base-767461e509abbf0e0b0039256b87840f3fce36be.tar.gz frameworks_base-767461e509abbf0e0b0039256b87840f3fce36be.tar.bz2 |
telephony: Change string to string-array config_tether_apndata to support mvno
Update tethering profiles to use string-array in config.xml.
Bug: 10096119
Change-Id: I551236040c810b9603fb84542af9765184ce0c29
19 files changed, 86 insertions, 35 deletions
diff --git a/core/res/res/values-mcc202-mnc05/config.xml b/core/res/res/values-mcc202-mnc05/config.xml index ec5ecaf..c74f2d7 100644 --- a/core/res/res/values-mcc202-mnc05/config.xml +++ b/core/res/res/values-mcc202-mnc05/config.xml @@ -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> diff --git a/core/res/res/values-mcc208-mnc10/config.xml b/core/res/res/values-mcc208-mnc10/config.xml index 10a6c5d..3c3a68b 100644 --- a/core/res/res/values-mcc208-mnc10/config.xml +++ b/core/res/res/values-mcc208-mnc10/config.xml @@ -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> diff --git a/core/res/res/values-mcc214-mnc01/config.xml b/core/res/res/values-mcc214-mnc01/config.xml index ecd8124..895b770 100644 --- a/core/res/res/values-mcc214-mnc01/config.xml +++ b/core/res/res/values-mcc214-mnc01/config.xml @@ -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> diff --git a/core/res/res/values-mcc214-mnc07/config.xml b/core/res/res/values-mcc214-mnc07/config.xml index ce7526c..2712abc 100644 --- a/core/res/res/values-mcc214-mnc07/config.xml +++ b/core/res/res/values-mcc214-mnc07/config.xml @@ -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> diff --git a/core/res/res/values-mcc222-mnc10/config.xml b/core/res/res/values-mcc222-mnc10/config.xml index 67467a0..5a74462 100644 --- a/core/res/res/values-mcc222-mnc10/config.xml +++ b/core/res/res/values-mcc222-mnc10/config.xml @@ -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> diff --git a/core/res/res/values-mcc234-mnc20/config.xml b/core/res/res/values-mcc234-mnc20/config.xml index 619e517..814960a 100644 --- a/core/res/res/values-mcc234-mnc20/config.xml +++ b/core/res/res/values-mcc234-mnc20/config.xml @@ -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. --> diff --git a/core/res/res/values-mcc235-mnc94/config.xml b/core/res/res/values-mcc235-mnc94/config.xml index 723af3d..d527304 100644 --- a/core/res/res/values-mcc235-mnc94/config.xml +++ b/core/res/res/values-mcc235-mnc94/config.xml @@ -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. --> diff --git a/core/res/res/values-mcc268-mnc03/config.xml b/core/res/res/values-mcc268-mnc03/config.xml index 0d5fe57..2f5171b 100644 --- a/core/res/res/values-mcc268-mnc03/config.xml +++ b/core/res/res/values-mcc268-mnc03/config.xml @@ -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> diff --git a/core/res/res/values-mcc302-mnc370/config.xml b/core/res/res/values-mcc302-mnc370/config.xml index 9cfe31f..a367e76 100644 --- a/core/res/res/values-mcc302-mnc370/config.xml +++ b/core/res/res/values-mcc302-mnc370/config.xml @@ -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. --> diff --git a/core/res/res/values-mcc302-mnc660/config.xml b/core/res/res/values-mcc302-mnc660/config.xml index 000f897..c689d22 100644 --- a/core/res/res/values-mcc302-mnc660/config.xml +++ b/core/res/res/values-mcc302-mnc660/config.xml @@ -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. --> diff --git a/core/res/res/values-mcc302-mnc720/config.xml b/core/res/res/values-mcc302-mnc720/config.xml index dfc58fe..b4b4334 100644 --- a/core/res/res/values-mcc302-mnc720/config.xml +++ b/core/res/res/values-mcc302-mnc720/config.xml @@ -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. --> diff --git a/core/res/res/values-mcc302-mnc780/config.xml b/core/res/res/values-mcc302-mnc780/config.xml index cd40191..51abd36 100644 --- a/core/res/res/values-mcc302-mnc780/config.xml +++ b/core/res/res/values-mcc302-mnc780/config.xml @@ -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"> diff --git a/core/res/res/values-mcc311-mnc190/config.xml b/core/res/res/values-mcc311-mnc190/config.xml index a6c4d1b..c17a07c 100644 --- a/core/res/res/values-mcc311-mnc190/config.xml +++ b/core/res/res/values-mcc311-mnc190/config.xml @@ -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> diff --git a/core/res/res/values-mcc334-mnc050/config.xml b/core/res/res/values-mcc334-mnc050/config.xml index 00c4155..f6777d0 100644 --- a/core/res/res/values-mcc334-mnc050/config.xml +++ b/core/res/res/values-mcc334-mnc050/config.xml @@ -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> diff --git a/core/res/res/values-mcc340-mnc01/config.xml b/core/res/res/values-mcc340-mnc01/config.xml index bb491ed..cfc1380 100644 --- a/core/res/res/values-mcc340-mnc01/config.xml +++ b/core/res/res/values-mcc340-mnc01/config.xml @@ -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> diff --git a/core/res/res/values-mcc425-mnc07/config.xml b/core/res/res/values-mcc425-mnc07/config.xml index 51a9934..a092fb9 100644 --- a/core/res/res/values-mcc425-mnc07/config.xml +++ b/core/res/res/values-mcc425-mnc07/config.xml @@ -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"> diff --git a/core/res/res/values-mcc505-mnc01/config.xml b/core/res/res/values-mcc505-mnc01/config.xml index 7331c50..1705e4a 100644 --- a/core/res/res/values-mcc505-mnc01/config.xml +++ b/core/res/res/values-mcc505-mnc01/config.xml @@ -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. --> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 6713944..9e4fc95 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 24c24f8..bd480d3 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -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" /> @@ -1546,6 +1545,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" /> |