From d109a6b2cd42a892caeacd2ea686a5f8fd75c779 Mon Sep 17 00:00:00 2001 From: Jordan Liu Date: Tue, 4 Oct 2016 11:46:03 -0700 Subject: [PATCH] Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY Add the key to CarrierConfigManager and remove the old configs which are no longer needed. Bug: 29873049 Change-Id: I2197cabca2addbbbe15f0f13985a6f5d8794d64a Merged-In: I2197cabca2addbbbe15f0f13985a6f5d8794d64a --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/res/res/values-mcc259-mnc05/config.xml | 35 ------------------- core/res/res/values/config.xml | 13 ------- core/res/res/values/symbols.xml | 1 - .../telephony/CarrierConfigManager.java | 17 +++++++++ 7 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 core/res/res/values-mcc259-mnc05/config.xml diff --git a/api/current.txt b/api/current.txt index 9cfbbc7d4ef3f..a60c14f6ca4c7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36703,6 +36703,7 @@ package android.telephony { field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName"; field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl"; field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent"; + field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array"; field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool"; field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool"; field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool"; diff --git a/api/system-current.txt b/api/system-current.txt index fab5e00919234..b4aa57251b23f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -39638,6 +39638,7 @@ package android.telephony { field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName"; field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl"; field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent"; + field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array"; field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool"; field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool"; field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool"; diff --git a/api/test-current.txt b/api/test-current.txt index 7a58e1e17177a..6763e49afee3e 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -36780,6 +36780,7 @@ package android.telephony { field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName"; field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl"; field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent"; + field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array"; field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool"; field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool"; field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool"; diff --git a/core/res/res/values-mcc259-mnc05/config.xml b/core/res/res/values-mcc259-mnc05/config.xml deleted file mode 100644 index 065668c61efab..0000000000000 --- a/core/res/res/values-mcc259-mnc05/config.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - 1 - 2 - 3 - 9 - 10 - 11 - 14 - 15 - - diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index a8be8d34e19a8..6f4b3b8393986 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1867,19 +1867,6 @@ where if the preferred is used we don't try the others. --> false - - - 4 - 5 - 6 - 7 - 8 - 12 - - false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 6f2822bd2d98d..30203ee9877c0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1648,7 +1648,6 @@ - diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index d064cd9c79de7..a1316a98fd460 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -207,6 +207,14 @@ public class CarrierConfigManager { public static final String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool"; + /** + * List of RIL radio technologies (See {@link ServiceState} {@code RIL_RADIO_TECHNOLOGY_*} + * constants) which support only a single data connection at a time. Some carriers do not + * support multiple pdp on UMTS. + */ + public static final String + KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array"; + /** * Override the platform's notion of a network operator being considered roaming. * Value is string array of MCCMNCs to be considered roaming for 3GPP RATs. @@ -848,6 +856,15 @@ public class CarrierConfigManager { sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS, new String[]{"default", "mms", "dun", "supl"}); + sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY, + new int[]{ + 4, /* IS95A */ + 5, /* IS95B */ + 6, /* 1xRTT */ + 7, /* EVDO_0 */ + 8, /* EVDO_A */ + 12 /* EVDO_B */ + }); sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null); sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null); sDefaults.putStringArray(KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY, null);