commit 07e02b6d25f5a731a36ad49b482e35c14c97cbdc
author Junda Liu <junda@google.com> Wed May 13 22:09:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 13 22:09:22 2015 +0000
tree 1541af2b86b75f61ce6f064574318e1113da3f06
parent 7b1b3613b9b927606254429acc811dd9bfeeebff
parent cd115b738c3ead973425b64c19e3f78052979261

Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 4941df6..b3beaf9 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -133,8 +133,8 @@
     /** 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 @@
         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);