From 9e4cd8332ac89bc409445eff3b81d739edaccb0f Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Fri, 22 May 2015 17:29:43 -0700
Subject: [PATCH] Add vvm type for t-mobile.

T-Mobile has slightly different configuration details so add a vvm type
to correspond to what they use: comverse vvm.

Bug: 21126480
Change-Id: I83fd0c5651bf94eb912dd44f4b52924d8bcdd4e7
---
 .../android/telephony/CarrierConfigManager.java  | 11 +----------
 .../java/android/telephony/TelephonyManager.java | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index b3beaf9acc8c3..7d39efccdfc5c 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -222,15 +222,6 @@ public class CarrierConfigManager {
      */
     public static final String STRING_VVM_TYPE = "string_vvm_type";
 
-    /* Visual voicemail protocols */
-
-    /**
-     * The OMTP protocol.
-     *
-     * @hide
-     */
-    public static final String VVM_TYPE_OMTP = "vvm_type_omtp";
-
     private final static String TAG = "CarrierConfigManager";
 
     /** The default value for every variable. */
@@ -333,7 +324,7 @@ public class CarrierConfigManager {
      * Depending on simState, the config may be cleared or loaded from config app. This is only used
      * by SubscriptionInfoUpdater.
      * </p>
-     * 
+     *
      * @hide
      */
     @SystemApi
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index d674b31115ca9..fbc70de598021 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -605,6 +605,22 @@ public class TelephonyManager {
     @SystemApi
     public static final int SIM_ACTIVATION_RESULT_CANCELED = 4;
 
+    /* Visual voicemail protocols */
+
+    /**
+     * The OMTP protocol.
+     *
+     * @hide
+     */
+    public static final String VVM_TYPE_OMTP = "vvm_type_omtp";
+
+    /**
+     * A flavor of OMTP protocol for Comverse.
+     *
+     * @hide
+     */
+    public static final String VVM_TYPE_CVVM = "vvm_type_cvvm";
+
     //
     //
     // Device Info