summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJonathan Basseri <misterikkit@google.com>2015-06-19 11:07:22 -0700
committerJonathan Basseri <misterikkit@google.com>2015-06-19 12:28:08 -0700
commit019523a8a44dcab0bac7cb4fa3c22ada7cca6804 (patch)
tree91fd8c83778c4584b9eaecdaecf0b2950223d015 /telephony
parent92dfab8d96dc854b8ccc48e1b2805069997879d5 (diff)
downloadframeworks_base-019523a8a44dcab0bac7cb4fa3c22ada7cca6804.zip
frameworks_base-019523a8a44dcab0bac7cb4fa3c22ada7cca6804.tar.gz
frameworks_base-019523a8a44dcab0bac7cb4fa3c22ada7cca6804.tar.bz2
Migrate 'csp_enabled' to CarrierConfigManager.
This variable controls whether SIM cards are allowed to disable manual carrier selection, so it makes more sense for it to be managed as carrier config. Currently the variable is only used in device overlays for specific networks, but we are dropping the device-overlay so that this simply applies to those networks. Change-Id: Ia6ba6a89c94c0916c19bdf792e48a4feac87eded
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 01cab33..c20032f 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -298,6 +298,14 @@ public class CarrierConfigManager {
public static final String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING =
"ci_action_on_sys_update_extra_val_string";
+ /**
+ * If this is true, the SIM card (through Customer Service Profile EF file) will be able to
+ * prevent manual operator selection. If false, this SIM setting will be ignored and manual
+ * operator selection will always be available. See CPHS4_2.WW6, CPHS B.4.7.1 for more
+ * information
+ */
+ public static final String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";
+
// These variables are used by the MMS service and exposed through another API, {@link
// SmsManager}. The variable names and string values are copied from there.
public static final String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";
@@ -377,6 +385,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING, "");
sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING, "");
sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING, "");
+ sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false);
sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);