diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-09-06 15:34:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-06 15:34:48 +0000 |
| commit | 37d6cd8f771907d8a41e741cb6dd6591b3976d72 (patch) | |
| tree | f66cade5f22b46816974f803f5ef6525be8d24d7 | |
| parent | 33f5ffc3f38ced6b3c2ba9b69fc890c637a8b3d8 (diff) | |
| parent | e6d915d78ecdb0f4d4428cb5421615473601ab4f (diff) | |
| download | okhttp-37d6cd8f771907d8a41e741cb6dd6591b3976d72.tar.gz | |
Merge "Fix ConfigAwareConnectionPoolTest" am: 9ac02268c4
am: e6d915d78e
Change-Id: I11ba8386da5ac50447ebc14e50609549c7b60a36
| -rw-r--r-- | android/main/java/com/squareup/okhttp/ConfigAwareConnectionPool.java (renamed from android/main/java/libcore/net/http/ConfigAwareConnectionPool.java) | 4 | ||||
| -rw-r--r-- | android/main/java/libcore/net/http/HttpHandler.java | 1 | ||||
| -rw-r--r-- | android/main/java/libcore/net/http/HttpsHandler.java | 1 | ||||
| -rw-r--r-- | android/test/java/com/squareup/okhttp/ConfigAwareConnectionPoolTest.java (renamed from android/test/java/libcore/net/http/ConfigAwareConnectionPoolTest.java) | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/android/main/java/libcore/net/http/ConfigAwareConnectionPool.java b/android/main/java/com/squareup/okhttp/ConfigAwareConnectionPool.java index a50c0d0..36c3101 100644 --- a/android/main/java/libcore/net/http/ConfigAwareConnectionPool.java +++ b/android/main/java/com/squareup/okhttp/ConfigAwareConnectionPool.java @@ -15,9 +15,7 @@ * limitations under the License. */ -package libcore.net.http; - -import com.squareup.okhttp.ConnectionPool; +package com.squareup.okhttp; import libcore.net.event.NetworkEventDispatcher; import libcore.net.event.NetworkEventListener; diff --git a/android/main/java/libcore/net/http/HttpHandler.java b/android/main/java/libcore/net/http/HttpHandler.java index 4c9a9a8..cf351ad 100644 --- a/android/main/java/libcore/net/http/HttpHandler.java +++ b/android/main/java/libcore/net/http/HttpHandler.java @@ -22,6 +22,7 @@ import com.squareup.okhttp.ConnectionSpec; import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkUrlFactories; import com.squareup.okhttp.OkUrlFactory; +import com.squareup.okhttp.ConfigAwareConnectionPool; import com.squareup.okhttp.internal.URLFilter; import libcore.net.NetworkSecurityPolicy; import java.io.IOException; diff --git a/android/main/java/libcore/net/http/HttpsHandler.java b/android/main/java/libcore/net/http/HttpsHandler.java index 3dd870e..c50611c 100644 --- a/android/main/java/libcore/net/http/HttpsHandler.java +++ b/android/main/java/libcore/net/http/HttpsHandler.java @@ -24,6 +24,7 @@ import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkUrlFactories; import com.squareup.okhttp.OkUrlFactory; import com.squareup.okhttp.Protocol; +import com.squareup.okhttp.ConfigAwareConnectionPool; import java.net.Proxy; import java.util.Collections; diff --git a/android/test/java/libcore/net/http/ConfigAwareConnectionPoolTest.java b/android/test/java/com/squareup/okhttp/ConfigAwareConnectionPoolTest.java index 73bfd98..825f980 100644 --- a/android/test/java/libcore/net/http/ConfigAwareConnectionPoolTest.java +++ b/android/test/java/com/squareup/okhttp/ConfigAwareConnectionPoolTest.java @@ -15,9 +15,7 @@ * limitations under the License. */ -package libcore.net.http; - -import com.squareup.okhttp.ConnectionPool; +package com.squareup.okhttp; import org.junit.Test; |