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

Merge "Revert "Add config to use lower of IPv4/IPv6 MTU values"" am: c4631dca14 am: e876040336

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891498

Change-Id: I639b4abbe3c55be6803ba7c9fc2584d1aaf93c87
This commit is contained in:
Sarah Chin
2021-11-19 00:47:35 +00:00
committed by Automerger Merge Worker
parent 6d0d1ff1e6 e876040336
commit ae68643606
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5155,16 +5155,6 @@ public class CarrierConfigManager {
public static final String KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING =
"call_composer_picture_server_url_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";
/**
* Determines the default RTT mode.
*
@@ -5904,7 +5894,6 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");
sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);
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, true);
sDefaults.putInt(KEY_DEFAULT_RTT_MODE_INT, 0);