Merge "Remove SO_BINDTODEVICE from VPN protect"
This commit is contained in:
committed by
Android (Google) Code Review
commit
7b0eca3a7d
@@ -3641,8 +3641,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;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user