Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6accb573 authored by Stephen Li's avatar Stephen Li Committed by Android (Google) Code Review
Browse files

Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master

parents 302b9951 e5535d71
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -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>

+1 −0
Original line number Diff line number Diff line
@@ -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" />