Merge "Adding config variables for triggering CI action on System update." into mnc-dev

[android-x86/frameworks-base.git] / telephony / java / android / telephony / CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 058b33e..7303298 100644 (file)
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -114,17 +114,12 @@ public class CarrierConfigManager {
      * (Some carriers require that emergency calls *not* be logged, presumably to avoid the risk of
      * accidental redialing from the call log UI. This is a good idea, so the default here is
      * false.)
-     * <p>
-     * TODO: on the other hand, it might still be useful to have some record of the emergency calls
-     * you've made, or to be able to look up the exact date/time of an emergency call. So perhaps we
-     * <b>should</b> log those calls, but instead fix the call log to disable the "call" button for
-     * emergency numbers.
      */
     public static final String
             KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
 
     /** If true, removes the Voice Privacy option from Call Settings */
-    public static final String KEY_VOICE_PRIVACY_DISABLE_BOOL = "voice_privacy_disable_bool";
+    public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";
 
     /** Control whether users can reach the carrier portions of Cellular Network Settings. */
     public static final String
@@ -330,7 +325,7 @@ public class CarrierConfigManager {
         sDefaults.putBoolean(KEY_USE_HFA_FOR_PROVISIONING_BOOL, false);
         sDefaults.putBoolean(KEY_USE_OTASP_FOR_PROVISIONING_BOOL, false);
         sDefaults.putBoolean(KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, false);
-        sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_BOOL, false);
+        sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false);
         sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false);
         sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0);
         sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");