commit f0b3911a22209259fdef19cfa2a6365b3b2309bc
author Jonathan Basseri <misterikkit@google.com> Tue Jun 09 15:14:06 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Thu Jun 11 16:39:37 2015 +0000
tree dd5823f493640e39f1497c9e6f44d3fe76c73447
parent 0221fb19419eaa5b2fb3d47ca31a81c969eaed78

Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL

Disabling voice privacy sounds scary. Update this config variable name
to what it actually does, which is to hide some settings UI.

Bug: 21571894
Change-Id: I165f9e91cee6b7c7572d8540d63519f1454ece9e
(cherry picked from commit 38c58552d3d082092fc7b19ce01dfa68dd53e111)

src/com/android/phone/CdmaCallOptions.java

diff --git a/src/com/android/phone/CdmaCallOptions.java b/src/com/android/phone/CdmaCallOptions.java
index 9131ad6..4a5f229 100644
--- a/src/com/android/phone/CdmaCallOptions.java
+++ b/src/com/android/phone/CdmaCallOptions.java
@@ -59,7 +59,7 @@
             carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
         }
         if (subInfoHelper.getPhone().getPhoneType() != PhoneConstants.PHONE_TYPE_CDMA
-                || carrierConfig.getBoolean(CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_BOOL)) {
+                || carrierConfig.getBoolean(CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_UI_BOOL)) {
             // disable the entire screen
             getPreferenceScreen().setEnabled(false);
         }