diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2014-02-28 19:28:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-28 19:28:45 +0000 |
| commit | f87b2248497223a18ee0e5403967a5de55d8cbb5 (patch) | |
| tree | 44fc528c21758535074ddea455c743d8ec00905a /core/java/android/net | |
| parent | 9f6a372ca08c657447ef4b8dc6c80a89202247f8 (diff) | |
| parent | bcf12b302cd2715de54493808b2503de05c53757 (diff) | |
| download | frameworks_base-f87b2248497223a18ee0e5403967a5de55d8cbb5.zip frameworks_base-f87b2248497223a18ee0e5403967a5de55d8cbb5.tar.gz frameworks_base-f87b2248497223a18ee0e5403967a5de55d8cbb5.tar.bz2 | |
Merge "Remove SO_BINDTODEVICE from VPN protect"
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/VpnService.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index d7dc7f5..7385dff 100644 --- a/core/java/android/net/VpnService.java +++ b/core/java/android/net/VpnService.java @@ -151,9 +151,10 @@ public class VpnService extends Service { } /** - * Protect a socket from VPN connections. The socket will be bound to the - * current default network interface, so its traffic will not be forwarded - * through VPN. This method is useful if some connections need to be kept + * Protect a socket from VPN connections. After protecting, data sent + * through this socket will go directly to the underlying network, + * so its traffic will not be forwarded through the VPN. + * This method is useful if some connections need to be kept * outside of VPN. For example, a VPN tunnel should protect itself if its * destination is covered by VPN routes. Otherwise its outgoing packets * will be sent back to the VPN interface and cause an infinite loop. This |