Merge "Remove SO_BINDTODEVICE from VPN protect"

2014-02-28 19:28:44 +00:00
parent 9a2ef0b576 e05e257bd0
commit 7b0eca3a7d
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3641,8 +3641,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
            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;
            }