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

Commit 5cd5e277 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Prevent sending CLIR activation and deactivation code only"

parents 8ed3fb4b de2688ec

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44161,6 +44161,7 @@ package android.telephony { 
    field public static final String KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSRP_INT = "opportunistic_network_exit_threshold_rsrp_int";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSSNR_INT = "opportunistic_network_exit_threshold_rssnr_int";

    field public static final String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    field public static final String KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL = "prevent_clir_activation_and_deactivation_code_bool";

    field public static final String KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY = "radio_restart_failure_causes_int_array";

    field public static final String KEY_RCS_CONFIG_SERVER_URL_STRING = "rcs_config_server_url_string";

    field public static final String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -3170,6 +3170,14 @@ public class CarrierConfigManager { 
    public static final String KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY =

            "disconnect_cause_play_busytone_int_array";



    /**

     * Flag specifying whether to prevent sending CLIR activation("*31#") and deactivation("#31#")

     * code only without dialing number.

     * When {@code true}, these are prevented, {@code false} otherwise.

     */

    public static final String KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL =

            "prevent_clir_activation_and_deactivation_code_bool";



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

    private final static PersistableBundle sDefaults;
@@ -3596,6 +3604,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, null);

        sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,

                new int[] {4 /* BUSY */});

        sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);

    }



    /**