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

Commit 917d048d authored by Brad Ebinger's avatar Brad Ebinger Committed by Android (Google) Code Review
Browse files

Merge "Adds custom call forwarding block while roaming carrier config key"

parents 7a2d07f0 9ab43212

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37387,6 +37387,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";

    field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";

    field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";

    field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";

    field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

    field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";

    field public static final java.lang.String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40470,6 +40470,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";

    field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";

    field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";

    field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";

    field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

    field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";

    field public static final java.lang.String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37505,6 +37505,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";

    field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";

    field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";

    field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";

    field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

    field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";

    field public static final java.lang.String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+14 −0
Original line number Diff line number Diff line
@@ -1165,6 +1165,18 @@ public class CarrierConfigManager { 
    public static final String KEY_EDITABLE_TETHER_APN_BOOL =

            "editable_tether_apn_bool";



    /**

     * An array containing custom call forwarding number prefixes that will be blocked while the

     * device is reporting that it is roaming. By default, there are no custom call

     * forwarding prefixes and none of these numbers will be filtered. If one or more entries are

     * present, the system will not complete the call and display an error message.

     *

     * To display a message to the user when call forwarding fails for 3gpp MMI codes while roaming,

     * use the {@link #KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL} option instead.

     */

    public static final String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY =

            "call_forwarding_blocks_while_roaming_string_array";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -1370,6 +1382,8 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putBoolean(KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true);

        sDefaults.putBoolean(KEY_EDITABLE_TETHER_APN_BOOL, false);

        sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY,

                null);

    }



    /**

telephony/java/android/telephony/DisconnectCause.java

+10 −2
Original line number Diff line number Diff line
@@ -233,6 +233,12 @@ public class DisconnectCause { 
     */

    public static final int DIALED_ON_WRONG_SLOT = 56;



    /**

     * The call being placed was detected as a call forwarding number and was being dialed while

     * roaming on a carrier that does not allow this.

     */

    public static final int DIALED_CALL_FORWARDING_WHILE_ROAMING = 57;



    //*********************************************************************************************

    // When adding a disconnect type:

    // 1) Please assign the new type the next id value below.
@@ -241,14 +247,14 @@ public class DisconnectCause { 
    // 4) Update toString() with the newly added disconnect type.

    // 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.

    //

    // NextId: 57

    // NextId: 58

    //*********************************************************************************************



    /** Smallest valid value for call disconnect codes. */

    public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;



    /** Largest valid value for call disconnect codes. */

    public static final int MAXIMUM_VALID_VALUE = DIALED_ON_WRONG_SLOT;

    public static final int MAXIMUM_VALID_VALUE = DIALED_CALL_FORWARDING_WHILE_ROAMING;



    /** Private constructor to avoid class instantiation. */

    private DisconnectCause() {
@@ -370,6 +376,8 @@ public class DisconnectCause { 
            return "DATA_LIMIT_REACHED";

        case DIALED_ON_WRONG_SLOT:

            return "DIALED_ON_WRONG_SLOT";

        case DIALED_CALL_FORWARDING_WHILE_ROAMING:

            return "DIALED_CALL_FORWARDING_WHILE_ROAMING";

        default:

            return "INVALID: " + cause;

        }