commit 9504c6b5c5c7072f72d8a9e6df59dbda8a6ccbe4
author Jonathan Basseri <misterikkit@google.com> Thu Jun 04 14:23:32 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Fri Jun 05 14:55:26 2015 -0700
tree f7b06d134d8d48acdc26c9dc8697dcf02049cef1
parent 4eb890ab835a6e910bab4e98063e46f06d82464b

Renaming carrier config variable keys.

API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ib5d5aff1c9070d9e5913a4099fcf55c67b800150

src/com/android/phone/CdmaOptions.java

diff --git a/src/com/android/phone/CdmaOptions.java b/src/com/android/phone/CdmaOptions.java
index 76753fc..eabbdd2 100644
--- a/src/com/android/phone/CdmaOptions.java
+++ b/src/com/android/phone/CdmaOptions.java
@@ -66,9 +66,11 @@
 
         mButtonAPNExpand = (PreferenceScreen) mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);
         boolean removedAPNExpand = false;
-        PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+        PersistableBundle carrierConfig =
+                PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
         // Some CDMA carriers want the APN settings.
-        if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_SHOW_APN_SETTING_CDMA) && mButtonAPNExpand != null) {
+        if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL)
+                && mButtonAPNExpand != null) {
             mPrefScreen.removePreference(mButtonAPNExpand);
             removedAPNExpand = true;
         }
@@ -118,7 +120,7 @@
 
         // Read platform settings for carrier settings
         final boolean isCarrierSettingsEnabled = carrierConfig.getBoolean(
-                CarrierConfigManager.BOOL_CARRIER_SETTINGS_ENABLE);
+                CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL);
         if (!isCarrierSettingsEnabled) {
             Preference pref = mPrefScreen.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
             if (pref != null) {