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

Commit dd6b019b authored by Nancy Chen's avatar Nancy Chen Committed by Android Git Automerger
Browse files

am 83b5fedb: am 707368b5: Merge "Add vvm type for t-mobile." into mnc-dev 

* commit '83b5fedb':
  Add vvm type for t-mobile.
parents 2b9d74d4 83b5fedb

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. */

telephony/java/android/telephony/TelephonyManager.java

+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