Merge "Move of OkHttp facade API to new package." am: be2eb23cf4 am: d154dd4e4c

am: 3607e90501

Change-Id: I372cfde359137267b67de89972613006b7cc695c

5 files changed, 12 insertions, 20 deletions

diff --git a/android/main/java/libcore/net/http/HttpHandler.java b/android/main/java/com/squareup/okhttp/HttpHandler.java
index cf351ad..ef9a56b 100644
--- a/android/main/java/libcore/net/http/HttpHandler.java
+++ b/android/main/java/com/squareup/okhttp/HttpHandler.java
@@ -15,14 +15,8 @@
  *  limitations under the License.
  */
 
-package libcore.net.http;
-
-import com.squareup.okhttp.AndroidInternal;
-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;
+package com.squareup.okhttp;
+
 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/com/squareup/okhttp/HttpsHandler.java
index c50611c..d4c0b8b 100644
--- a/android/main/java/libcore/net/http/HttpsHandler.java
+++ b/android/main/java/com/squareup/okhttp/HttpsHandler.java
@@ -15,16 +15,7 @@
  *  limitations under the License.
  */
 
-package libcore.net.http;
-
-import com.squareup.okhttp.CertificatePinner;
-import com.squareup.okhttp.ConnectionSpec;
-import com.squareup.okhttp.ConnectionSpecs;
-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;
+package com.squareup.okhttp;
 
 import java.net.Proxy;
 import java.util.Collections;
diff --git a/android/main/java/libcore/net/http/Dns.java b/android/main/java/com/squareup/okhttp/internalandroidapi/Dns.java
index e42c349..349fade 100644
--- a/android/main/java/libcore/net/http/Dns.java
+++ b/android/main/java/com/squareup/okhttp/internalandroidapi/Dns.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package libcore.net.http;
+package com.squareup.okhttp.internalandroidapi;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/android/main/java/libcore/net/http/HttpURLConnectionFactory.java b/android/main/java/com/squareup/okhttp/internalandroidapi/HttpURLConnectionFactory.java
index 050405c..f1da451 100644
--- a/android/main/java/libcore/net/http/HttpURLConnectionFactory.java
+++ b/android/main/java/com/squareup/okhttp/internalandroidapi/HttpURLConnectionFactory.java
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package libcore.net.http;
+package com.squareup.okhttp.internalandroidapi;
 
 import com.squareup.okhttp.ConnectionPool;
+import com.squareup.okhttp.HttpHandler;
+import com.squareup.okhttp.HttpsHandler;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.OkUrlFactories;
 import com.squareup.okhttp.OkUrlFactory;
diff --git a/android/main/java/com/squareup/okhttp/internalandroidapi/README b/android/main/java/com/squareup/okhttp/internalandroidapi/README
new file mode 100644
index 0000000..e332837
--- /dev/null
+++ b/android/main/java/com/squareup/okhttp/internalandroidapi/README
@@ -0,0 +1,5 @@
+This package contains a facade over OkHttp that some parts of Android framework are allowed to
+depend on. This is not a stable API; it is an attempt to decouple framework code from OkHttp as
+much as is practical where public APIs cannot be used.
+
+Please talk to the maintainers before adding any new dependencies.