diff options
| author | 2015-05-13 22:09:20 +0000 | |
|---|---|---|
| committer | 2015-05-13 22:09:22 +0000 | |
| commit | 07e02b6d25f5a731a36ad49b482e35c14c97cbdc (patch) | |
| tree | 1541af2b86b75f61ce6f064574318e1113da3f06 | |
| parent | 7b1b3613b9b927606254429acc811dd9bfeeebff (diff) | |
| parent | cd115b738c3ead973425b64c19e3f78052979261 (diff) | |
Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 4941df6b189d..b3beaf9acc8c 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -133,8 +133,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"; @@ -256,7 +256,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); |