summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-03-14 04:12:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 04:12:54 +0000
commite67658d6e28a36b4ea5cbebefc80882af1793519 (patch)
tree07e55a4715a07b28d549e18291683a61f0bffaed /core
parente0627cf869a4f137b1181572605fcc372be6c7f9 (diff)
parent4ecd833ee35d1120f8c1ae52367947cacfc263a4 (diff)
downloadframeworks_base-e67658d6e28a36b4ea5cbebefc80882af1793519.zip
frameworks_base-e67658d6e28a36b4ea5cbebefc80882af1793519.tar.gz
frameworks_base-e67658d6e28a36b4ea5cbebefc80882af1793519.tar.bz2
am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4': ConnectivityService: add support to set TCP initial rwnd
Diffstat (limited to 'core')
-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 04f3f0a..3810eb3 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
*/