From: Jack Yu Date: Wed, 31 Oct 2018 00:39:14 +0000 (-0700) Subject: Deprecated the resource config_tether_apndata X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=080f131a69fddb68ebe9282dc1c490a07ae6d496;p=android-x86%2Fframeworks-base.git Deprecated the resource config_tether_apndata The resource has been migrated into the database so we can remove this resource now. Test: Telephony sanity tests Bug: 113942223 Merged-In: I1b65a8bee81f1d190c587cf65cb55da64a184284 Change-Id: I1b65a8bee81f1d190c587cf65cb55da64a184284 (cherry picked from commit 25b7a917f850f5d46826ca594f61708954739575) --- diff --git a/core/res/res/values-mcc208-mnc01/config.xml b/core/res/res/values-mcc208-mnc01/config.xml deleted file mode 100644 index 5930e3aa7a12..000000000000 --- a/core/res/res/values-mcc208-mnc01/config.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - Orange Internet,orange.fr,,,orange,orange,,,,,208,01,1,DUN - - - diff --git a/core/res/res/values-mcc208-mnc10/config.xml b/core/res/res/values-mcc208-mnc10/config.xml deleted file mode 100644 index 3ed78181ffe6..000000000000 --- a/core/res/res/values-mcc208-mnc10/config.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - SFR option modem,websfr,,,,,,,,,208,10,,DUN - [ApnSettingV3]INTERNET NRJ,internetnrj,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,4E - - - diff --git a/core/res/res/values-mcc214-mnc01/config.xml b/core/res/res/values-mcc214-mnc01/config.xml index 24150a782d22..876c26e7f629 100644 --- a/core/res/res/values-mcc214-mnc01/config.xml +++ b/core/res/res/values-mcc214-mnc01/config.xml @@ -30,14 +30,4 @@ 7 9 - - - - INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN - - diff --git a/core/res/res/values-mcc214-mnc07/config.xml b/core/res/res/values-mcc214-mnc07/config.xml deleted file mode 100644 index 4b7cc7c0d089..000000000000 --- a/core/res/res/values-mcc214-mnc07/config.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - Conexión Compartida,movistar.es,,,MOVISTAR,MOVISTAR,,,,,214,07,1,DUN - - - diff --git a/core/res/res/values-mcc222-mnc10/config.xml b/core/res/res/values-mcc222-mnc10/config.xml deleted file mode 100644 index c819de2ba43c..000000000000 --- a/core/res/res/values-mcc222-mnc10/config.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN - - diff --git a/core/res/res/values-mcc234-mnc20/config.xml b/core/res/res/values-mcc234-mnc20/config.xml index 1e4bb0be8802..224dc3113c1b 100644 --- a/core/res/res/values-mcc234-mnc20/config.xml +++ b/core/res/res/values-mcc234-mnc20/config.xml @@ -20,15 +20,6 @@ - - - - 3hotspot,3hotspot,,,,,,,,,234,20,0,DUN - - 1440 diff --git a/core/res/res/values-mcc235-mnc94/config.xml b/core/res/res/values-mcc235-mnc94/config.xml index d527304379fb..38ae2a0dceab 100644 --- a/core/res/res/values-mcc235-mnc94/config.xml +++ b/core/res/res/values-mcc235-mnc94/config.xml @@ -31,14 +31,6 @@ 9 - - - 3hotspot,3hotspot,,,,,,,,,235,94,0,DUN - - 1440 diff --git a/core/res/res/values-mcc268-mnc03/config.xml b/core/res/res/values-mcc268-mnc03/config.xml index 2f5171bccf35..876c26e7f629 100644 --- a/core/res/res/values-mcc268-mnc03/config.xml +++ b/core/res/res/values-mcc268-mnc03/config.xml @@ -30,13 +30,4 @@ 7 9 - - - - Optimus HotSpot,modem,,,,,,,,,268,03,,DUN - diff --git a/core/res/res/values-mcc302-mnc220/config.xml b/core/res/res/values-mcc302-mnc220/config.xml index 33081282d2ff..7289b4f8135a 100644 --- a/core/res/res/values-mcc302-mnc220/config.xml +++ b/core/res/res/values-mcc302-mnc220/config.xml @@ -23,17 +23,6 @@ 1410 - - - [ApnSettingV3]TELUS ISP,isp.telus.com,,,,,,,,,302,220,,DUN,IP,IP,true,0,,,,,,,gid,5455 - [ApnSettingV3]Tethered Mobile Internet,isp.mb.com,,,,,,,,,302,220,,DUN,,,true,0,,,,,,,gid,5043 - [ApnSettingV3]Tethered Public Mobile,isp.mb.com,,,,,,,,,302,220,,DUN,,,true,0,,,,,,,gid,4D4F - - SUPL_HOST=supl.google.com diff --git a/core/res/res/values-mcc302-mnc221/config.xml b/core/res/res/values-mcc302-mnc221/config.xml index bb0d4d5c431c..ff140756e96a 100644 --- a/core/res/res/values-mcc302-mnc221/config.xml +++ b/core/res/res/values-mcc302-mnc221/config.xml @@ -20,18 +20,6 @@ - - - - [ApnSettingV3]TELUS ISP,isp.telus.com,,,,,,,,,302,221,,DUN,,,true,0,,,,,,,gid,5455 - [ApnSettingV3]Tethered PC Mobile,isp.mb.com,,,,,,,,,302,221,,DUN,,,true,0,,,,,,,gid,5043 - [ApnSettingV3]Koodo,sp.koodo.com,,,,,,,,,302,221,,DUN,,,true,0,,,,,,,gid,4B4F - - SUPL_HOST=supl.google.com diff --git a/core/res/res/values-mcc302-mnc370/config.xml b/core/res/res/values-mcc302-mnc370/config.xml index 1241a9d029d6..ad3a654a0390 100644 --- a/core/res/res/values-mcc302-mnc370/config.xml +++ b/core/res/res/values-mcc302-mnc370/config.xml @@ -20,17 +20,6 @@ - - - - Fido LTE Tethering,ltedata.apn,,,,,,,,,302,370,,DUN - [ApnSettingV3]MTS Tethering,internet.mts,,,,,,,,,302,370,,DUN,,,true,0,,,,,,,gid,2C - - 1410 diff --git a/core/res/res/values-mcc302-mnc660/config.xml b/core/res/res/values-mcc302-mnc660/config.xml index 8c2e7023081e..beb233670c2d 100644 --- a/core/res/res/values-mcc302-mnc660/config.xml +++ b/core/res/res/values-mcc302-mnc660/config.xml @@ -29,16 +29,6 @@ 7 9 - - - - MTS -Tethering,internet.mts,,,,,,,,,302,660,,DUN - - 1430 diff --git a/core/res/res/values-mcc302-mnc720/config.xml b/core/res/res/values-mcc302-mnc720/config.xml index ef1ecd29845c..cfcf1f849ec5 100644 --- a/core/res/res/values-mcc302-mnc720/config.xml +++ b/core/res/res/values-mcc302-mnc720/config.xml @@ -20,19 +20,6 @@ - - - - Rogers LTE Tethering,ltedata.apn,,,,,,,,,302,720,,DUN - [ApnSettingV3]chatr Tethering,chatrisp.apn,,,,,,,,,302,720,,DUN,,,true,0,,,,,,,imsi,302720x94 - [ApnSettingV3]Tbaytel Tethering,ltedata.apn,,,,,,,,,302,720,,DUN,IPV4V6,IP,true,0,,,,,,,gid,BA - [ApnSettingV3]Cityfone Tethering,ltedata.apn,,,,,,,,,302,720,,DUN,IPV4V6,IP,true,0,,,,,,,spn,CITYFONE - - 1430 diff --git a/core/res/res/values-mcc311-mnc190/config.xml b/core/res/res/values-mcc311-mnc190/config.xml index c17a07c963e0..876c26e7f629 100644 --- a/core/res/res/values-mcc311-mnc190/config.xml +++ b/core/res/res/values-mcc311-mnc190/config.xml @@ -30,13 +30,4 @@ 7 9 - - - - Tether,broadband.cellular1.net,,,,,,,,,311,190,,DUN - - diff --git a/core/res/res/values-mcc334-mnc050/config.xml b/core/res/res/values-mcc334-mnc050/config.xml index 616a8e8fa283..23678f15fba3 100644 --- a/core/res/res/values-mcc334-mnc050/config.xml +++ b/core/res/res/values-mcc334-mnc050/config.xml @@ -31,15 +31,6 @@ 9 - - - Modem,modem.iusacellgsm.mx,,,iusacellgsm,iusacellgsm,,,,,334,050,1,DUN - - "#9" diff --git a/core/res/res/values-mcc340-mnc01/config.xml b/core/res/res/values-mcc340-mnc01/config.xml index 1ca89635af7b..3b23b85e61d2 100644 --- a/core/res/res/values-mcc340-mnc01/config.xml +++ b/core/res/res/values-mcc340-mnc01/config.xml @@ -29,13 +29,4 @@ 7 9 - - - - Orangeweb,orangeweb,,,orange,orange,,,,,340,01,1,DUN - diff --git a/core/res/res/values-mcc425-mnc07/config.xml b/core/res/res/values-mcc425-mnc07/config.xml index 770cebde8c1d..876c26e7f629 100644 --- a/core/res/res/values-mcc425-mnc07/config.xml +++ b/core/res/res/values-mcc425-mnc07/config.xml @@ -30,13 +30,4 @@ 7 9 - - - - PC HOT mobile,pc.hotm,,,,,,,,,425,07,,DUN - diff --git a/core/res/res/values-mcc454-mnc10/config.xml b/core/res/res/values-mcc454-mnc10/config.xml deleted file mode 100644 index 79a9a7e00ca5..000000000000 --- a/core/res/res/values-mcc454-mnc10/config.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - one2free Tethering,internet,,,,,,,,,454,10,0,DUN - - - diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 206e655c9c33..98cb640e7196 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -513,17 +513,6 @@ - - - - false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a397a6a8db02..4d5ef68468e3 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1833,7 +1833,6 @@ - diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0ee493c5ba7b..1c525bd6a782 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -6209,7 +6209,7 @@ public class TelephonyManager { /** * Check TETHER_DUN_REQUIRED and TETHER_DUN_APN settings, net.tethering.noprovisioning - * SystemProperty, and config_tether_apndata to decide whether DUN APN is required for + * SystemProperty to decide whether DUN APN is required for * tethering. * * @return 0: Not required. 1: required. 2: Not set. diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 84c2a5d78018..45bccc9523b2 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -667,7 +667,7 @@ interface ITelephony { /** * Check TETHER_DUN_REQUIRED and TETHER_DUN_APN settings, net.tethering.noprovisioning - * SystemProperty, and config_tether_apndata to decide whether DUN APN is required for + * SystemProperty to decide whether DUN APN is required for * tethering. * * @return 0: Not required. 1: required. 2: Not set.