LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Merge "Track moving of OkHttp facade API to new package." am: 3af8a3d48a am: 1f7fcb7970" into oc-mr1-dev-plus-aosp

Browse Source 
am: f63d128dd9

Change-Id: Ibb562280213bdaa499787c0e6cfd371c553d4f1c
This commit is contained in:
Tobias Thierer
2017-10-30 18:32:55 +00:00
committed by android-build-merger
parent 7b76b5f4ac ff55edaea6
commit 52cb2d9ce4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/net/Network.java
View File

@@ -16,14 +16,14 @@
package android.net; package android.net;
import android.os.Parcelable;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.system.OsConstants; import android.system.OsConstants;
import libcore.net.http.Dns; import com.android.okhttp.internalandroidapi.Dns;
import libcore.net.http.HttpURLConnectionFactory; import com.android.okhttp.internalandroidapi.HttpURLConnectionFactory;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
@@ -34,11 +34,12 @@ import java.net.MalformedURLException;
import java.net.Socket; import java.net.Socket;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.net.SocketException; import java.net.SocketException;
import java.net.UnknownHostException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.UnknownHostException;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.net.SocketFactory; import javax.net.SocketFactory;
/** /**