Merge "Add vvm type for t-mobile." into mnc-dev (707368b5) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+1 −10

Original line number	Diff line number	Diff line
		@@ -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. */

+16 −0

Original line number	Diff line number	Diff line
		@@ -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