summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-03-17 17:56:10 +0900
committerLorenzo Colitti <lorenzo@google.com>2015-03-17 19:46:12 +0900
commit4ff9f0fd9fdddb760d10fc6677b57655a9fbdb0d (patch)
treeaf7a7420b3ace271bbc2680cca9b34544f55ac0c /core
parent04b8d3aab6acdf382c74d12a89b5fc50fd8d0158 (diff)
downloadframeworks_base-4ff9f0fd9fdddb760d10fc6677b57655a9fbdb0d.zip
frameworks_base-4ff9f0fd9fdddb760d10fc6677b57655a9fbdb0d.tar.gz
frameworks_base-4ff9f0fd9fdddb760d10fc6677b57655a9fbdb0d.tar.bz2
Add a protectFromVpn method that takes a FileDescriptor
Bug: 19704592 Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19
Diffstat (limited to 'core')
-rw-r--r--core/java/android/net/NetworkUtils.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index 01704e5..02fbe73 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -178,6 +178,15 @@ public class NetworkUtils {
public native static int bindSocketToNetwork(int socketfd, int netId);
/**
+ * Protect {@code fd} 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.
+ */
+ public static boolean protectFromVpn(FileDescriptor fd) {
+ return protectFromVpn(fd.getInt$());
+ }
+
+ /**
* Protect {@code socketfd} 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.