commit 7b0eca3a7d26820be5cb69ffc1c6509049e0612a
author Chad Brubaker <cbrubaker@google.com> Fri Feb 28 19:28:44 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 28 19:28:45 2014 +0000
tree 458bf70943d1643dfc914eef2654f46109fc1b40
parent 9a2ef0b5762ee75f6ecce11c28a24f421a664969
parent e05e257bd09239ac827cfa337a1911d0b8140ef9

Merge "Remove SO_BINDTODEVICE from VPN protect"

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 36907ed..fc38019 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3641,8 +3641,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;
             }