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

Commit 48fe53f0 authored by Qiong Liu's avatar Qiong Liu Committed by takeshi tanigawa
Browse files

Add config to display VM number as default number of CF 

Add config to determine whether to display voicemail number when
call forwarding number is null. The default value is false.

Test: manual - checked the voicemail number shown as default
Bug: 67855679
Change-Id: Iffa7f9a31757e2df2535abf0269a768ff4e67e8c
parent 6d987430

telephony/java/android/telephony/CarrierConfigManager.java

+13 −0
Original line number Diff line number Diff line
@@ -1358,6 +1358,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.
@@ -1785,6 +1796,8 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_PREF_NETWORK_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.putBoolean(KEY_EDITABLE_TETHER_APN_BOOL, false);

        sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY,