diff options
| author | Nancy Chen <nancychen@google.com> | 2015-05-26 20:54:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-26 20:54:27 +0000 |
| commit | 707368b583dbc16ae65fdd91a5dd34f377aa29fa (patch) | |
| tree | d1f6d547c9bce07b06f7a6937d513f4764decefa | |
| parent | d1e0b9493acc377c4d2638e103a80692d07e6936 (diff) | |
| parent | 9e4cd8332ac89bc409445eff3b81d739edaccb0f (diff) | |
| download | frameworks_base-707368b583dbc16ae65fdd91a5dd34f377aa29fa.zip frameworks_base-707368b583dbc16ae65fdd91a5dd34f377aa29fa.tar.gz frameworks_base-707368b583dbc16ae65fdd91a5dd34f377aa29fa.tar.bz2 | |
Merge "Add vvm type for t-mobile." into mnc-dev
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 11 | ||||
| -rw-r--r-- | telephony/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 b3beaf9..7d39efc 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 d674b31..fbc70de 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 |