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

Commit d44b0c45 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add config to display VM number as default number of CF" am: 3e26cb18 

am: 9953542c

Change-Id: I93696ab322ca9a2edcbf03efeb33cbf9f6c6279a
parents 710fac6a 9953542c

telephony/java/android/telephony/CarrierConfigManager.java

+13 −0
Original line number Diff line number Diff line
@@ -1420,6 +1420,17 @@ public class CarrierConfigManager { 
    public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL =

        "support_3gpp_call_forwarding_while_roaming_bool";



    /**

     * Boolean indicating whether to display voicemail number as default call forwarding number in

     * call forwarding settings.

     * If true, display vm number when cf number is null.

     * If false, display the cf number from network.

     * By default this value is false.

     * @hide

     */

    public static final String KEY_DISPLAY_VOICEMAIL_NUMBER_AS_DEFAULT_CALL_FORWARDING_NUMBER_BOOL =

            "display_voicemail_number_as_default_call_forwarding_number";



    /**

     * When {@code true}, the user will be notified when they attempt to place an international call

     * when the call is placed using wifi calling.
@@ -1862,6 +1873,8 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putBoolean(KEY_ALLOW_USSD_REQUESTS_VIA_TELEPHONY_MANAGER_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true);

        sDefaults.putBoolean(KEY_DISPLAY_VOICEMAIL_NUMBER_AS_DEFAULT_CALL_FORWARDING_NUMBER_BOOL,

                false);

        sDefaults.putBoolean(KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL, false);

        sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY,

                null);