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/InCallScreenShowActivation.java

diff --git a/src/com/android/phone/InCallScreenShowActivation.java b/src/com/android/phone/InCallScreenShowActivation.java
index 64d2aa6..b3df183 100644
--- a/src/com/android/phone/InCallScreenShowActivation.java
+++ b/src/com/android/phone/InCallScreenShowActivation.java
@@ -74,7 +74,8 @@
         if (intent.getAction().equals(OtaUtils.ACTION_PERFORM_CDMA_PROVISIONING)) {
 
             PersistableBundle carrierConfig = app.getCarrierConfig();
-            boolean usesHfa = carrierConfig.getBoolean(CarrierConfigManager.BOOL_USE_HFA_FOR_PROVISIONING);
+            boolean usesHfa = carrierConfig.getBoolean(
+                    CarrierConfigManager.KEY_USE_HFA_FOR_PROVISIONING_BOOL);
             if (usesHfa) {
                 Log.i(LOG_TAG, "Starting Hfa from ACTION_PERFORM_CDMA_PROVISIONING");
                 startHfa();
@@ -82,7 +83,8 @@
                 return;
             }
 
-            boolean usesOtasp = carrierConfig.getBoolean(CarrierConfigManager.BOOL_USE_OTASP_FOR_PROVISIONING);
+            boolean usesOtasp = carrierConfig.getBoolean(
+                    CarrierConfigManager.KEY_USE_OTASP_FOR_PROVISIONING_BOOL);
             if (usesOtasp) {
                 // On voice-capable devices, we perform CDMA provisioning in
                 // "interactive" mode by directly launching the InCallScreen.