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

Commit 48fb9d15 authored by Jonathan Basseri's avatar Jonathan Basseri Committed by Android (Google) Code Review
Browse files

Merge "Migrate 'csp_enabled' to CarrierConfigManager." into mnc-dev

parents be2e38e0 019523a8

api/current.txt

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

    field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";

    field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

    field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";

api/system-current.txt

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

    field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";

    field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

    field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";

telephony/java/android/telephony/CarrierConfigManager.java

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

            "ci_action_on_sys_update_extra_val_string";



    /**

     * If this is true, the SIM card (through Customer Service Profile EF file) will be able to

     * prevent manual operator selection. If false, this SIM setting will be ignored and manual

     * operator selection will always be available. See CPHS4_2.WW6, CPHS B.4.7.1 for more

     * information

     */

    public static final String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";



    // These variables are used by the MMS service and exposed through another API, {@link

    // SmsManager}. The variable names and string values are copied from there.

    public static final String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";
@@ -377,6 +385,7 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING, "");

        sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING, "");

        sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING, "");

        sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false);



        sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);