commit 6f3e6dd0a2c35a47c2f66649ac8c7641d78db715
author JP Abgrall <jpa@google.com> Thu Mar 13 20:33:43 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 13 20:33:44 2014 +0000
tree bc2fa3a3c45634a2628d201083a7d341d47ac5b6
parent 4452b850e3acbc74cfef25d49dca421ee03c0dc2
parent fe9b47e6d0ea4a771c5d73e14963247965cd20ba

Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev

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

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 6a28fd6..e283da9 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3667,8 +3667,7 @@
             int user = UserHandle.getUserId(Binder.getCallingUid());
             if (ConnectivityManager.isNetworkTypeValid(type) && mNetTrackers[type] != null) {
                 synchronized(mVpns) {
-                    mVpns.get(user).protect(socket,
-                            mNetTrackers[type].getLinkProperties().getInterfaceName());
+                    mVpns.get(user).protect(socket);
                 }
                 return true;
             }