Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Define allow_metered_network_for_cert_download_bool flag"

Browse Source
This commit is contained in:
Ecco Park
2019-03-22 23:33:59 +00:00
committed by Android (Google) Code Review
parent 4c2ec4c89c 1074c885a9
commit 0dfc06c627
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1861,6 +1861,16 @@ public class CarrierConfigManager {
public static final String KEY_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.
* @hide
@@ -3008,6 +3018,7 @@ public class CarrierConfigManager {
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_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.putInt(KEY_IMSI_ENCODING_METHOD_INT, 2045);
sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);