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

Commit 2850d7a5 authored by Yorke Lee's avatar Yorke Lee
Browse files

Set default values for VVM constants in CarrierConfigManager 

* Also hide the constants, they don't need to be @SystemApi
* Make VVM_PORT_NUMBER an Int

Bug: 20272209
Change-Id: I0d47afd7916d40f77ba5bf8e95306b46b27c15b3
parent e354f5d5

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -32714,10 +32714,6 @@ 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 {

























telephony/java/android/telephony/CarrierConfigManager.java



+5
−5




























Original line number
Diff line number
Diff line








@@ -85,7 +85,6 @@ public class CarrierConfigManager {













     *















     *  @hide















     */













    @SystemApi















    public static final String STRING_VVM_DESTINATION_NUMBER = "string_vvm_destination_number";































    /**









@@ -93,15 +92,13 @@ public class CarrierConfigManager {













     *















     * @hide















     */













    @SystemApi













    public static final String SHORT_VVM_PORT_NUMBER = "string_vvm_port_number";













    public static final String INT_VVM_PORT_NUMBER = "int_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 */









@@ -111,7 +108,6 @@ public class CarrierConfigManager {













     *















     * @hide















     */













    @SystemApi















    public static final String VVM_TYPE_OMTP = "vvm_type_omtp";































    private final static String TAG = "CarrierConfigManager";









@@ -127,6 +123,10 @@ public class CarrierConfigManager {













        sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false);































        sDefaults.putInt(INT_VOLTE_REPLACEMENT_RAT, 0);



























        sDefaults.putString(STRING_VVM_DESTINATION_NUMBER, "");













        sDefaults.putString(STRING_VVM_TYPE, "");













        sDefaults.putInt(INT_VVM_PORT_NUMBER, 0);















    }































    /**