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

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

View File

@@ -4082,6 +4082,13 @@ public class CarrierConfigManager {
*/
public static final String KEY_USE_ACS_FOR_RCS_BOOL = "use_acs_for_rcs_bool";
/**
* 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;
@@ -4628,6 +4635,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, "");
sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);
sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);
sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, false);
}
/**