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

Commit e45b4aa2 authored by Josh Hou's avatar Josh Hou Committed by Automerger Merge Worker
Browse files

Merge "Allow call forwarding number with prefixes to be dialed while on IMS... 

Merge "Allow call forwarding number with prefixes to be dialed while on IMS roaming" am: 1f17c75b am: 514a9e40

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393116

Change-Id: I7a4a90761deea319355c7900ae8e78777455924c
parents d89656e3 514a9e40

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -2380,6 +2380,16 @@ public class CarrierConfigManager { 
    public static final String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY =

    public static final String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY =

            "call_forwarding_blocks_while_roaming_string_array";

            "call_forwarding_blocks_while_roaming_string_array";





    /**

     * Call forwarding number prefixes defined by {@link

     * #KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY} which will be allowed while the

     * device is reporting that it is roaming and IMS is registered over LTE or Wi-Fi.

     * By default this value is {@code true}.

     * @hide

     */

    public static final String KEY_SUPPORT_IMS_CALL_FORWARDING_WHILE_ROAMING_BOOL =

            "support_ims_call_forwarding_while_roaming_bool";



    /**

    /**

     * The day of the month (1-31) on which the data cycle rolls over.

     * The day of the month (1-31) on which the data cycle rolls over.

     * <p>

     * <p>
@@ -4222,6 +4232,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL, false);

        sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY,

        sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY,

                null);

                null);

        sDefaults.putBoolean(KEY_SUPPORT_IMS_CALL_FORWARDING_WHILE_ROAMING_BOOL, true);

        sDefaults.putInt(KEY_LTE_EARFCNS_RSRP_BOOST_INT, 0);

        sDefaults.putInt(KEY_LTE_EARFCNS_RSRP_BOOST_INT, 0);

        sDefaults.putStringArray(KEY_BOOSTED_LTE_EARFCNS_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_BOOSTED_LTE_EARFCNS_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_USE_ONLY_RSRP_FOR_LTE_SIGNAL_BAR_BOOL, false);

        sDefaults.putBoolean(KEY_USE_ONLY_RSRP_FOR_LTE_SIGNAL_BAR_BOOL, false);