summaryrefslogtreecommitdiff
path: root/src/de/blinkt/openvpn/OpenVPN.java
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-03 22:51:47 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-03 22:51:47 +0200
commit2b3ea917b0a830e3ff4817c7240e0f1808ae58bc (patch)
tree2359f4fca5e51d2b7eb253728f62b74db7da0e69 /src/de/blinkt/openvpn/OpenVPN.java
parent9cd2069d5d57fc605a8eae3e6f8a0b09b56d4c16 (diff)
parentd3c50d3637462d4e3e3a3c09d43d37ce5656f67a (diff)
Merge Merge try number 2
Diffstat (limited to 'src/de/blinkt/openvpn/OpenVPN.java')
-rw-r--r--src/de/blinkt/openvpn/OpenVPN.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/de/blinkt/openvpn/OpenVPN.java b/src/de/blinkt/openvpn/OpenVPN.java
index ea6c4926..86bd3665 100644
--- a/src/de/blinkt/openvpn/OpenVPN.java
+++ b/src/de/blinkt/openvpn/OpenVPN.java
@@ -100,8 +100,7 @@ public class OpenVPN {
public static int openTunDevice() {
Log.d(TAG,"Opening tun device");
- ParcelFileDescriptor pfd = mOpenVpnService.openTun();
- return pfd.detachFd();
+ return mOpenVpnService.openTun();
}
//! Dummy method being called to force loading of JNI Libraries
public static void foo() { }