summaryrefslogtreecommitdiffstats
path: root/dalvik/src
diff options
context:
space:
mode:
Diffstat (limited to 'dalvik/src')
-rw-r--r--dalvik/src/main/java/dalvik/system/BlockGuard.java11
1 files changed, 2 insertions, 9 deletions
diff --git a/dalvik/src/main/java/dalvik/system/BlockGuard.java b/dalvik/src/main/java/dalvik/system/BlockGuard.java
index d212cfc..22d3d0b 100644
--- a/dalvik/src/main/java/dalvik/system/BlockGuard.java
+++ b/dalvik/src/main/java/dalvik/system/BlockGuard.java
@@ -201,10 +201,9 @@ public final class BlockGuard {
return mNetwork.writeDirect(fd, address, offset, count);
}
- public boolean connectNonBlocking(FileDescriptor fd, InetAddress inetAddress, int port)
- throws IOException {
+ public boolean connect(FileDescriptor fd, InetAddress inetAddress, int port) throws IOException {
BlockGuard.getThreadPolicy().onNetwork();
- return mNetwork.connectNonBlocking(fd, inetAddress, port);
+ return mNetwork.connect(fd, inetAddress, port);
}
public boolean isConnected(FileDescriptor fd, int timeout) throws IOException {
@@ -251,12 +250,6 @@ public final class BlockGuard {
mNetwork.sendUrgentData(fd, value);
}
- public void connect(FileDescriptor aFD, InetAddress inetAddress, int port,
- int timeout) throws SocketException {
- BlockGuard.getThreadPolicy().onNetwork();
- mNetwork.connect(aFD, inetAddress, port, timeout);
- }
-
public boolean select(FileDescriptor[] readFDs, FileDescriptor[] writeFDs,
int numReadable, int numWritable, long timeout, int[] flags)
throws SocketException {