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

Commit 6b733f61 authored by Ta-wei Yen's avatar Ta-wei Yen Committed by Android (Google) Code Review
Browse files

Merge "Add KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN to CarrierConfigManager"

parents 718e16ad 685f53c2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35218,6 +35218,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";

    field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";

    field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

    field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";

    field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";

    field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";

    field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37487,6 +37487,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";

    field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";

    field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

    field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";

    field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";

    field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";

    field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35220,6 +35220,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";

    field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";

    field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

    field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";

    field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";

    field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";

    field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";

telephony/java/android/telephony/CarrierConfigManager.java

+6 −0
Original line number Diff line number Diff line
@@ -384,6 +384,11 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_VVM_TYPE_STRING = "vvm_type_string";



    /**

     * Whether cellular data is required to access visual voicemail.

     */

    public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";



    /**

     * The package name of the carrier's visual voicemail app to ensure that dialer visual voicemail

     * and carrier visual voicemail are not active at the same time.
@@ -599,6 +604,7 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");

        sDefaults.putInt(KEY_VVM_PORT_NUMBER_INT, 0);

        sDefaults.putString(KEY_VVM_TYPE_STRING, "");

        sDefaults.putBoolean(KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN,false);

        sDefaults.putString(KEY_CARRIER_VVM_PACKAGE_NAME_STRING, "");

        sDefaults.putBoolean(KEY_CI_ACTION_ON_SYS_UPDATE_BOOL, false);

        sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING, "");