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

Commit 6a539f24 authored by Steven Liu's avatar Steven Liu
Browse files

Clean up the Carrier Wifi network config in framework 

Bug: 130875004
Test: unit test, manual test.
Change-Id: Ic553a460e6491bad5d6fb41f4a0d4bcdf8e7e45f
parent 95a77354

telephony/java/android/telephony/CarrierConfigManager.java

+0 −7
Original line number Diff line number Diff line
@@ -2075,12 +2075,6 @@ public class CarrierConfigManager { 
    public static final String KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL =

            "allow_metered_network_for_cert_download_bool";



    /**

     * Carrier specified WiFi networks.

     * @hide

     */

    public static final String KEY_CARRIER_WIFI_STRING_ARRAY = "carrier_wifi_string_array";



    /**

     * Time delay (in ms) after which we show the notification to switch the preferred

     * network.
@@ -3645,7 +3639,6 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_DIGITS_HELPER_TEXT_ON_STK_INPUT_SCREEN_BOOL, true);

        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);

        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putBoolean(KEY_ALLOW_USSD_REQUESTS_VIA_TELEPHONY_MANAGER_BOOL, true);