commit 3ff30d224bb762cfac4bd091131a75c11ff27589
author Jordan Liu <jminjie@google.com> Thu Sep 01 13:25:13 2016 -0700
committer Jordan Liu <jminjie@google.com> Wed Sep 07 13:31:38 2016 -0700
tree 22b1476f3654b85a0437c7ffbea5b54baa751804
parent 8b4b2f6327b77701b56c2531adaa1b725fce1757

Add key to CarrierConfigManager

Add KEY_DEFAULT_VM_NUMBER_STRING and default value. Note that default
vm number no longer needs to be a string array, as gid is handled
within the new carrier_configs. Remove references to old config.

Bug: 29873049
Change-Id: I56e4e3713c27f449fd892db501b6097c8c89c3c6

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index e27ab52..a6440f2 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -269,6 +269,14 @@
             "support_downgrade_vt_to_audio_bool";
 
     /**
+     * Where there is no preloaded voicemail number on a SIM card, specifies the carrier's default
+     * voicemail number.
+     * When empty string, no default voicemail number is specified.
+     */
+    public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";
+
+
+    /**
      * Flag specifying whether WFC over IMS should be available for carrier: independent of
      * carrier provisioning. If false: hard disabled. If true: then depends on carrier
      * provisioning, availability etc.
@@ -977,6 +985,7 @@
         sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_BOOL, false);
         sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false);
         sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true);
+        sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, "");
         sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);
         sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, false);
         sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false);