Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" into rvc-qpr-dev

This commit is contained in:
Jack Yu
2021-01-19 19:05:46 +00:00
committed by Android (Google) Code Review

View File

@@ -3928,6 +3928,13 @@ public class CarrierConfigManager {
public static final String KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED =
"use_lower_mtu_value_if_both_received";
/**
* Indicates temporarily unmetered mobile data is supported by the carrier.
* @hide
*/
public static final String KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL =
"network_temp_not_metered_supported_bool";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -4466,6 +4473,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);
sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");
sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);
sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, false);
}
/**