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

Commit 14fd0ca6 authored by Vineeta Srivastava's avatar Vineeta Srivastava Committed by android-build-merger
Browse files

Merge "wifi calling emergency address carrier config" into nyc-mr1-dev 

am: db41be8e

* commit 'db41be8e':
  wifi calling emergency address carrier config

Change-Id: I5d1ff70da4e92637e77d144eba70009a12ced185
parents df0268f0 db41be8e

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -591,6 +591,14 @@ public class CarrierConfigManager { 
    /** @hide */

    public static final String KEY_WFC_DATA_SPN_FORMAT_IDX_INT = "wfc_data_spn_format_idx_int";



    /**

     * The Component Name of the activity that can setup the emergency addrees for WiFi Calling

     * as per carrier requirement.

     * @hide

     */

     public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING =

            "wfc_emergency_address_carrier_app_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
@@ -802,6 +810,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_WFC_OPERATOR_ERROR_CODES_STRING_ARRAY, null);

        sDefaults.putInt(KEY_WFC_SPN_FORMAT_IDX_INT, 0);

        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);



        // MMS defaults