Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45183fc5 authored by Tobias Thierer's avatar Tobias Thierer Committed by Gerrit Code Review
Browse files

Merge "Track moving of OkHttp facade API to new package."

parents 47c83a5f 4c6d2ecd
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@

package android.net;

import android.os.Parcelable;
import android.os.Parcel;
import android.os.Parcelable;
import android.system.ErrnoException;
import android.system.Os;
import android.system.OsConstants;

import libcore.net.http.Dns;
import libcore.net.http.HttpURLConnectionFactory;
import com.android.okhttp.internalandroidapi.Dns;
import com.android.okhttp.internalandroidapi.HttpURLConnectionFactory;

import java.io.FileDescriptor;
import java.io.IOException;
@@ -34,11 +34,12 @@ import java.net.MalformedURLException;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.net.URL;
import java.net.URLConnection;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;

import javax.net.SocketFactory;

/**