Merge "Add config to use lower of IPv4/IPv6 MTU values" into rvc-qpr-dev am: 85f5802bec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12539769

Change-Id: I82b478f4aef060c7664c6d58e6abb9d6a97a0fea
This commit is contained in:
TreeHugger Robot
2020-09-25 21:17:16 +00:00
committed by Automerger Merge Worker

View File

@@ -3932,6 +3932,16 @@ public class CarrierConfigManager {
public static final String KEY_DEFAULT_PREFERRED_APN_NAME_STRING = public static final String KEY_DEFAULT_PREFERRED_APN_NAME_STRING =
"default_preferred_apn_name_string"; "default_preferred_apn_name_string";
/**
* For Android 11, provide a temporary solution for OEMs to use the lower of the two MTU values
* for IPv4 and IPv6 if both are sent.
* TODO: remove in later release
*
* @hide
*/
public static final String KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED =
"use_lower_mtu_value_if_both_received";
/** The default value for every variable. */ /** The default value for every variable. */
private final static PersistableBundle sDefaults; private final static PersistableBundle sDefaults;
@@ -4473,6 +4483,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]); sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]);
sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false); sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);
sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, ""); sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");
sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);
} }
/** /**