summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2015-05-13 14:57:48 -0700
committerJunda Liu <junda@google.com>2015-05-13 14:57:48 -0700
commitcd115b738c3ead973425b64c19e3f78052979261 (patch)
tree454adfceb00627c075ac2b73db716b8575f64671 /telephony
parentc69cd0bf7586c57f9662955d798a2ae0eef6ee76 (diff)
downloadframeworks_base-cd115b738c3ead973425b64c19e3f78052979261.zip
frameworks_base-cd115b738c3ead973425b64c19e3f78052979261.tar.gz
frameworks_base-cd115b738c3ead973425b64c19e3f78052979261.tar.bz2
Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.
Bug: b/21028396 Change-Id: I029671b6bcd03a07956ccf35f4e5fe03d16a2218
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 2caa83c..8c61aa7 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -131,8 +131,8 @@ public class CarrierConfigManager {
/** Used in Cellular Network Settings for preferred network type. */
public static final String BOOL_PREFER_2G = "bool_prefer_2g";
- /** Show cdma auto network mode in (glabal) roaming */
- public static final String BOOL_SHOW_CDMA = "bool_show_cdma";
+ /** Show cdma network mode choices 1x, 3G, global etc. */
+ public static final String BOOL_SHOW_CDMA_CHOICES = "bool_show_cdma_choices";
/** CDMA activation goes through HFA */
public static final String BOOL_USE_HFA_FOR_PROVISIONING = "bool_use_hfa_for_provisioning";
@@ -254,7 +254,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(BOOL_OPERATOR_SELECTION_EXPAND, true);
sDefaults.putBoolean(BOOL_PREFER_2G, true);
sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false);
- sDefaults.putBoolean(BOOL_SHOW_CDMA, false);
+ sDefaults.putBoolean(BOOL_SHOW_CDMA_CHOICES, false);
sDefaults.putBoolean(BOOL_SHOW_ONSCREEN_DIAL_BUTTON, true);
sDefaults.putBoolean(BOOL_SIM_NETWORK_UNLOCK_ALLOW_DISMISS, true);
sDefaults.putBoolean(BOOL_SUPPORT_PAUSE_IMS_VIDEO_CALLS, true);