From 1074c885a976ee4637fde453b6bc44bc4cdbab97 Mon Sep 17 00:00:00 2001 From: Ecco Park Date: Thu, 21 Mar 2019 12:58:09 -0700 Subject: [PATCH] Define allow_metered_network_for_cert_download_bool flag Bug: 128521583 Test: plugin sim into device and verified downloading a certificate is working over LTE Change-Id: I7b5fe4433ffd59d9a9fb810db7d95a2d0c8eb856 Signed-off-by: Ecco Park --- .../java/android/telephony/CarrierConfigManager.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 5f9ef3c0c601a..7a7b30d2db252 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1846,6 +1846,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 @@ -2982,6 +2992,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_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1); sDefaults.putInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1);