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

Commit 1a6b6fc2 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android (Google) Code Review
Browse files

Merge "Merge commit 'b68601d2' into... 

Merge "Merge commit 'b68601d2' into manual_merge_b68601d" into nyc-mr1-dev
parents 7d64d642 a7f74b1d

telephony/java/android/telephony/CarrierConfigManager.java

+15 −0
Original line number Diff line number Diff line
@@ -600,6 +600,19 @@ public class CarrierConfigManager { 
     public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING =

            "wfc_emergency_address_carrier_app_string";



    /**

     * Boolean to decide whether to use #KEY_CARRIER_NAME_STRING from CarrierConfig app.

     * @hide

     */

    public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";



    /**

     * String to identify carrier name in CarrierConfig app. This string is used only if

     * #KEY_CARRIER_NAME_OVERRIDE_BOOL is true

     * @hide

     */

    public static final String KEY_CARRIER_NAME_STRING = "carrier_name_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
@@ -813,6 +826,8 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_WFC_DATA_SPN_FORMAT_IDX_INT, 0);

        sDefaults.putString(KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING, "");

        sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);

        sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);

        sDefaults.putString(KEY_CARRIER_NAME_STRING, "");



        // MMS defaults

        sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);