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

Commit 11765b3f authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Fix naming of key" am: 0b74a1da am: c68c2f68 

am: 1d67d022

Change-Id: I6165395ac186baac90c2d08d7c7114c7b5bc72d3
parents 6c852fb2 1d67d022

telephony/java/android/telephony/CarrierConfigManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ public class CarrierConfigManager { 
     * is returned.

     * @hide

     */

    public static final String FILTERED_CNAP_NAMES_STRING_ARRAY = "filtered_cnap_names_string_array";

    public static final String KEY_FILTERED_CNAP_NAMES_STRING_ARRAY = "filtered_cnap_names_string_array";



    /**

     * Determine whether user can change Wi-Fi Calling preference in roaming.
@@ -1320,7 +1320,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL, false);

        sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false);

        sDefaults.putStringArray(FILTERED_CNAP_NAMES_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);

        sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);

        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);