Merge "Fix ConfigAwareConnectionPoolTest" am: 9ac02268c4 am: e6d915d78e
am: 37d6cd8f77
Change-Id: I08c12915f9aa6c667ae3cc54e2344a1cf1812006
diff --git a/android/main/java/libcore/net/http/ConfigAwareConnectionPool.java b/android/main/java/com/squareup/okhttp/ConfigAwareConnectionPool.java
similarity index 97%
rename from android/main/java/libcore/net/http/ConfigAwareConnectionPool.java
rename to 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.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.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
similarity index 95%
rename from android/test/java/libcore/net/http/ConfigAwareConnectionPoolTest.java
rename to 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;