aboutsummaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2013-07-18 13:21:47 +0100
committerNarayan Kamath <narayan@google.com>2013-07-18 13:36:13 +0100
commita82f42bbeedd0b07f3892f3b0efaa8122dc8f264 (patch)
treee508857d2203d128b780e594f3a6a63d52f18cbf /android
parent00834c9a00d53b29c6e486cb0b6f80fd505416e1 (diff)
downloadokhttp-a82f42bbeedd0b07f3892f3b0efaa8122dc8f264.tar.gz
Update okhttp to commit abc8c9a30bc0c5a9a
Change-Id: I5331e760f09aaae0a267c50829f01eb7a68d76e1
Diffstat (limited to 'android')
-rw-r--r--android/main/java/com/squareup/okhttp/internal/Platform.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/android/main/java/com/squareup/okhttp/internal/Platform.java b/android/main/java/com/squareup/okhttp/internal/Platform.java
index db633c6..0a95f07 100644
--- a/android/main/java/com/squareup/okhttp/internal/Platform.java
+++ b/android/main/java/com/squareup/okhttp/internal/Platform.java
@@ -17,7 +17,9 @@
package com.squareup.okhttp.internal;
import dalvik.system.SocketTagger;
+import java.io.IOException;
import java.io.OutputStream;
+import java.net.InetSocketAddress;
import java.net.NetworkInterface;
import java.net.Socket;
import java.net.SocketException;
@@ -123,4 +125,14 @@ public final class Platform {
return DEFAULT_MTU;
}
}
+
+ public void connectSocket(Socket socket, InetSocketAddress address,
+ int connectTimeout) throws IOException {
+ socket.connect(address, connectTimeout);
+ }
+
+ /** Prefix used on custom headers. */
+ public String getPrefix() {
+ return "X-Android";
+ }
}