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

Commit 7dacb11c authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Add CarrierConfig of voicemail number for roaming and IMS unregistered" 

am: 637c0742

Change-Id: I4c0ac6c03b885744f05ea3876be8e86b7e7c4066
parents 06097b72 637c0742

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44074,6 +44074,7 @@ package android.telephony { 
    field public static final String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

    field public static final String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final String KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING = "default_vm_number_roaming_and_ims_unregistered_string";

    field public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

    field public static final String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array";

    field public static final String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -525,6 +525,15 @@ public class CarrierConfigManager { 
    public static final String KEY_DEFAULT_VM_NUMBER_ROAMING_STRING =

            "default_vm_number_roaming_string";



    /**

     * Where there is no preloaded voicemail number on a SIM card, specifies the carrier's default

     * voicemail number while the device is both roaming and not registered for IMS.

     * When empty string, no default voicemail number is specified for roaming network and

     * unregistered state in IMS.

     */

    public static final String KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING =

            "default_vm_number_roaming_and_ims_unregistered_string";



    /**

     * Flag that specifies to use the user's own phone number as the voicemail number when there is

     * no pre-loaded voicemail number on the SIM card.
@@ -3178,6 +3187,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true);

        sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, "");

        sDefaults.putString(KEY_DEFAULT_VM_NUMBER_ROAMING_STRING, "");

        sDefaults.putString(KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING, "");

        sDefaults.putBoolean(KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL, false);

        sDefaults.putBoolean(KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, true);

        sDefaults.putBoolean(KEY_VILTE_DATA_IS_METERED_BOOL, true);