From 48903511b092feb7502f10f121bdf9b56f26395d Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Thu, 9 Apr 2015 13:17:20 -0700
Subject: [PATCH] Add keys for visual voicemail carrier configuration values

Each carrier has its own set of visual voicemail configuration values
to be retrieved from the carrier config manager API.

Bug:19236241
Change-Id: Ic1d59a13d2203c70aba178c315c47ec2661ea56e
---
 api/system-current.txt                        |  4 +++
 .../telephony/CarrierConfigManager.java       | 36 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 6f9238e9f7d0a..1e824d5f6eeed 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30755,6 +30755,10 @@ package android.telephony {
     field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported";
     field public static final java.lang.String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma";
     field public static final java.lang.String INT_VOLTE_REPLACEMENT_RAT = "int_volte_replacement_rat";
+    field public static final java.lang.String SHORT_VVM_PORT_NUMBER = "string_vvm_port_number";
+    field public static final java.lang.String STRING_VVM_DESTINATION_NUMBER = "string_vvm_destination_number";
+    field public static final java.lang.String STRING_VVM_TYPE = "string_vvm_type";
+    field public static final java.lang.String VVM_TYPE_OMTP = "vvm_type_omtp";
   }
 
   public final class CellIdentityCdma implements android.os.Parcelable {
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 004398eef3e26..b6f6888eebe74 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -73,6 +73,42 @@ public class CarrierConfigManager {
      */
     public static final String INT_VOLTE_REPLACEMENT_RAT = "int_volte_replacement_rat";
 
+    /* The following 3 fields are related to carrier visual voicemail. */
+
+    /**
+     *  The carrier number MO sms messages are sent to.
+     *
+     *  @hide
+     */
+    @SystemApi
+    public static final String STRING_VVM_DESTINATION_NUMBER = "string_vvm_destination_number";
+
+    /**
+     * The port through which the MO sms messages are sent through.
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final String SHORT_VVM_PORT_NUMBER = "string_vvm_port_number";
+
+    /**
+     * The type of visual voicemail protocol the carrier adheres to (see below).
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final String STRING_VVM_TYPE = "string_vvm_type";
+
+    /* Visual voicemail protocols */
+
+    /**
+     * The OMTP protocol.
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final String VVM_TYPE_OMTP = "vvm_type_omtp";
+
     private final static String TAG = "CarrierConfigManager";
 
     /** The default value for every variable. */