commit f6c68ca61aeffb157d1dacb9bd193fea71fa64a0
author Chad Brubaker <cbrubaker@google.com> Mon Feb 24 18:09:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 24 18:09:36 2014 +0000
tree fd7c81c685cfee714970df8ccfb5cee4113e0719
parent d3bc570b7b26eb51981cd16c87cf3790e0734339
parent 170386ea78f749ff60c41ca4e9aa82461d2d3c08

Merge "Add the calling package name to requestRouteToHost"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 0b25a2f..95d146c 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2633,7 +2633,7 @@
        final int mtu = nt.getLinkProperties().getMtu();
 
        if (mtu < 68 || mtu > 10000) {
-           loge("Unexpected mtu value: " + nt);
+           loge("Unexpected mtu value: " + mtu + ", " + nt);
            return;
        }
 
@@ -2670,6 +2670,15 @@
             }
             setBufferSize(bufferSizes);
         }
+
+        final String defaultRwndKey = "net.tcp.default_init_rwnd";
+        int defaultRwndValue = SystemProperties.getInt(defaultRwndKey, 0);
+        Integer rwndValue = Settings.Global.getInt(mContext.getContentResolver(),
+            Settings.Global.TCP_DEFAULT_INIT_RWND, defaultRwndValue);
+        final String sysctlKey = "sys.sysctl.tcp_def_init_rwnd";
+        if (rwndValue != 0) {
+            SystemProperties.set(sysctlKey, rwndValue.toString());
+        }
     }
 
     /**