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

Commit 3628901b authored by Andy Chou's avatar Andy Chou Committed by android-build-merger
Browse files

Merge "Specifies the carrier's default voicemail number for roaming network." into pi-dev 

am: a547a518

Change-Id: Ib684023316d56af18066d1a9461630429fcb2afb
parents 4e9d0bd2 a547a518

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -396,6 +396,15 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";



    /**

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

     * voicemail number for roaming network.

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

     * @hide

     */

    public static final String KEY_DEFAULT_VM_NUMBER_ROAMING_STRING =

            "default_vm_number_roaming_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.
@@ -1931,6 +1940,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_LTE_TO_WIFI_BOOL, false);

        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.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);