diff options
| author | Jonathan Basseri <misterikkit@google.com> | 2015-06-11 04:14:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 04:14:45 +0000 |
| commit | 57b7ec0495377c961b7c74daa6f6fa0d7c37139f (patch) | |
| tree | 508a0364bb23c74536983ac66acbe1be4b9fcdeb | |
| parent | 9d543ebfea86ee94a994eebc752dc7d007f8cb90 (diff) | |
| parent | 3360c2657908e6cb8565c85bdb33e0e2a3fd92b4 (diff) | |
| download | frameworks_base-57b7ec0495377c961b7c74daa6f6fa0d7c37139f.zip frameworks_base-57b7ec0495377c961b7c74daa6f6fa0d7c37139f.tar.gz frameworks_base-57b7ec0495377c961b7c74daa6f6fa0d7c37139f.tar.bz2 | |
Merge "Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL" into mnc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 9f59a20..21d455d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30736,7 +30736,7 @@ package android.telephony { field public static final java.lang.String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool"; field public static final java.lang.String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool"; field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool"; - field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_BOOL = "voice_privacy_disable_bool"; + field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool"; field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int"; field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool"; } diff --git a/api/system-current.txt b/api/system-current.txt index a37a1b4..08addd0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32954,7 +32954,7 @@ package android.telephony { field public static final java.lang.String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool"; field public static final java.lang.String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool"; field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool"; - field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_BOOL = "voice_privacy_disable_bool"; + field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool"; field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int"; field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool"; } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b74b52d..6de438c 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -124,7 +124,7 @@ public class CarrierConfigManager { 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 @@ -302,7 +302,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, ""); |