diff --git a/api/current.txt b/api/current.txt index f736bc0cf098f..fcdef65d26705 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36704,6 +36704,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 6645d53613b11..266ed08fd0cd0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -39639,6 +39639,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 4af06152121dd..49175c0580a11 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -36781,6 +36781,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 0309f74c4c810..4c282845027c1 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 91f0251d6fe90..27ddb5a69ce85 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);