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

Commit 0dfc06c6 authored by Ecco Park's avatar Ecco Park Committed by Android (Google) Code Review
Browse files

Merge "Define allow_metered_network_for_cert_download_bool flag"

parents 4c2ec4c8 1074c885

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -1861,6 +1861,16 @@ public class CarrierConfigManager { 
    public static final String KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL =

    public static final String KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL =

            "use_wfc_home_network_mode_in_roaming_network_bool";

            "use_wfc_home_network_mode_in_roaming_network_bool";





    /**

     * Flag specifying whether the carrier is allowed to use metered network to download a

     * certificate of Carrier-WiFi.

     * {@code false} - default value.

     *

     * @hide

     */

    public static final String KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL =

            "allow_metered_network_for_cert_download_bool";



    /**

    /**

     * Carrier specified WiFi networks.

     * Carrier specified WiFi networks.

     * @hide

     * @hide
@@ -3008,6 +3018,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);

        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);

        sDefaults.putBoolean(KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false);

        sDefaults.putBoolean(KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false);

        sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);

        sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL, false);

        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);

        sDefaults.putInt(KEY_IMSI_ENCODING_METHOD_INT, 2045);

        sDefaults.putInt(KEY_IMSI_ENCODING_METHOD_INT, 2045);

        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);