From 3643dd1a7a501c171d0cc127f880d6e2c6e11cfa Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Thu, 8 Sep 2016 12:45:58 -0700
Subject: Add editable_voicemail_number key to CarrierConfig

Add KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

This value exists to fix http://b/14093735. If a SIM card has no
voicemail number available, since the default number is empty, we allow
users to edit the voicemail number when this flag is true.
Merged-In: I68a494e2176306e4e9181a8ccb0aa818f3e08154

Bug: 29873049
Change-Id: I68a494e2176306e4e9181a8ccb0aa818f3e08154
---
 core/res/res/values/symbols.xml                            | 2 --
 telephony/java/android/telephony/CarrierConfigManager.java | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 72e5078ac55e..b64d573c1287 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -345,8 +345,6 @@
   <java-symbol type="integer"  name="config_wifi_operating_voltage_mv" />
   <java-symbol type="string"  name="config_wifi_framework_sap_2G_channel_list" />
 
-  <java-symbol type="bool" name="editable_voicemailnumber" />
-
   <java-symbol type="bool" name="config_wifi_framework_cellular_handover_enable_user_triggered_adjustment" />
   <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_tx_packet_threshold" />
   <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_rx_packet_threshold" />
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 3fc945a83617..17f0da0c0b11 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -181,6 +181,14 @@ public class CarrierConfigManager {
     /** After a CDMA conference call is merged, the swap button should be displayed. */
     public static final String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";
 
+    /**
+     * Since the default voicemail number is empty, if a SIM card does not have a voicemail number
+     * available the user cannot use voicemail. This flag allows the user to edit the voicemail
+     * number in such cases, and is false by default.
+     * @hide
+     */
+    public static final String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL= "editable_voicemail_number_bool";
+
     /**
      * Determine whether the voicemail notification is persistent in the notification bar. If true,
      * the voicemail notifications cannot be dismissed from the notification bar.
@@ -792,6 +800,7 @@ public class CarrierConfigManager {
         sDefaults.putBoolean(KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, false);
         sDefaults.putBoolean(KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL, true);
         sDefaults.putBoolean(KEY_USE_HFA_FOR_PROVISIONING_BOOL, false);
+        sDefaults.putBoolean(KEY_EDITABLE_VOICEMAIL_NUMBER_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_UI_BOOL, false);
-- 
cgit v1.2.3-59-g8ed1b