commit d35af171e4e61a119ea5c0b80b2b0c219aae867c
author Chad Brubaker <cbrubaker@google.com> Mon Feb 24 18:09:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 24 18:09:56 2014 +0000
tree 5540646d5dfacad646357e527001fc0827ba1271
parent 4dc2fda2a73ad6fd908d5022f8ac9deb806e87d1
parent 7965e0a452febabbca2e6a4378bfa5e44f19d16d

Merge "Only allow System apps to make VPN exempt routes"

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 2b69c75..97b78e5 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2697,7 +2697,7 @@
        final int mtu = nt.getLinkProperties().getMtu();
 
        if (mtu < 68 || mtu > 10000) {
-           loge("Unexpected mtu value: " + nt);
+           loge("Unexpected mtu value: " + mtu + ", " + nt);
            return;
        }
 
@@ -2734,6 +2734,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());
+        }
     }
 
     /**