summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-03-13 20:36:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 20:36:51 +0000
commit4ecd833ee35d1120f8c1ae52367947cacfc263a4 (patch)
tree30c85d5049edef4501fa15b9aaadc9482e458ebb /core/java/android
parent78f204aed8c0f3c8174616801d66f96a9a00a5fd (diff)
parent7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a (diff)
am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a': ConnectivityService: add support to set TCP initial rwnd
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 04f3f0aad84d..3810eb32ca94 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5140,6 +5140,12 @@ public final class Settings {
public static final String SMS_SHORT_CODE_RULE = "sms_short_code_rule";
/**
+ * Used to select TCP's default initial receiver window size in segments - defaults to a build config value
+ * @hide
+ */
+ public static final String TCP_DEFAULT_INIT_RWND = "tcp_default_init_rwnd";
+
+ /**
* Used to disable Tethering on a device - defaults to true
* @hide
*/