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

* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  Remove SO_BINDTODEVICE from VPN protect
This commit is contained in:
Chad Brubaker
2014-03-14 04:12:46 +00:00
committed by Android Git Automerger

View File

@@ -3661,8 +3661,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
int user = UserHandle.getUserId(Binder.getCallingUid()); int user = UserHandle.getUserId(Binder.getCallingUid());
if (ConnectivityManager.isNetworkTypeValid(type) && mNetTrackers[type] != null) { if (ConnectivityManager.isNetworkTypeValid(type) && mNetTrackers[type] != null) {
synchronized(mVpns) { synchronized(mVpns) {
mVpns.get(user).protect(socket, mVpns.get(user).protect(socket);
mNetTrackers[type].getLinkProperties().getInterfaceName());
} }
return true; return true;
} }