commit 7c2b1625d66d3c80c313160f78c8bccd9499539e
author Chad Brubaker <cbrubaker@google.com> Fri Mar 14 16:27:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 14 16:27:58 2014 +0000
tree cd3b1e45b7c6b38217c4b424f61511ce2064774e
parent 358eaa7825140ee571a7b9d61705fb3adb5b60aa
parent 78f204aed8c0f3c8174616801d66f96a9a00a5fd

am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev

* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  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 88882f3..bf5e72f 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3665,8 +3665,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;
             }