From e5535d71fc4f703385cfb5db44969aac9f4dc8c4 Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Wed, 7 Sep 2016 12:01:24 -0700
Subject: [PATCH] Add cdma_3waycall_flash_delay key to CarrierConfig

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

Bug: 29873049
(cherry picked from commit bd3f2a7eb01b88d8e26deea4e4ef3e5ce423955c)

Change-Id: If3f658281e62d1c2669f862c6c3812a7437c6dce
---
 core/res/res/values/config.xml  | 15 +++++++++++++++
 core/res/res/values/symbols.xml |  1 +
 2 files changed, 16 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 05d9a28333b76..f909695610119 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2212,6 +2212,21 @@
     <!-- Sprint need a 70 ms delay for 3way call -->
     <integer name="config_cdma_3waycall_flash_delay">0</integer>
 
+    <!-- If there is no preload VM number in the sim card, carriers such as
+         Verizon require to load a default vm number from the configurantion.
+         Define config_default_vm_number for this purpose. And there are two
+         optional formats for this configuration as below:
+         (1)<item>voicemail number</item>
+         (2)<item>voicemail number;gid</item>
+         The logic to pick up the correct voicemail number:
+         (1) If the config_default_vm_number array has no gid special item, the last one will be
+         picked
+         (2) If the config_default_vm_number array has gid special item and  it matches the current
+         sim's gid, it will be picked.
+         (3) If the config_default_vm_number array has gid special item but it doesn't match the
+         current sim's gid, the last one without gid will be picked -->
+    <string-array translatable="false" name="config_default_vm_number" />
+
     <!--SIM does not save, but the voice mail number to be changed. -->
     <bool name="editable_voicemailnumber">false</bool>
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index e64942aafbcf9..a51b29caa79c6 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2235,6 +2235,7 @@
   <java-symbol type="layout" name="resolver_different_item_header" />
   <java-symbol type="array" name="config_default_vm_number" />
   <java-symbol type="integer" name="config_cdma_3waycall_flash_delay"/>
+  <java-symbol type="array" name="config_default_vm_number" />
   <java-symbol type="attr" name="windowBackgroundFallback" />
   <java-symbol type="id" name="textSpacerNoButtons" />
   <java-symbol type="array" name="dial_string_replace" />