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

Merge "Replace interal okhttp APIs" am: 4fe7ff8d1f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669

Change-Id: I9f4e11b6e2ed2c5c09d7ea38e885de7186871edf
This commit is contained in:
Paul Hu
2021-03-16 12:44:35 +00:00
committed by Automerger Merge Worker
parent 3fa2c3e87a 4fe7ff8d1f
commit 7bd3aa2a13
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/android/net/Network.java
View File

@@ -30,10 +30,10 @@ import android.system.OsConstants;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.okhttp.internalandroidapi.Dns;
import com.android.okhttp.internalandroidapi.HttpURLConnectionFactory;
import libcore.io.IoUtils; import libcore.io.IoUtils;
import libcore.net.http.Dns;
import libcore.net.http.HttpURLConnectionFactory;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
@@ -299,7 +299,7 @@ public class Network implements Parcelable {
// Set configuration on the HttpURLConnectionFactory that will be good for all // Set configuration on the HttpURLConnectionFactory that will be good for all
// connections created by this Network. Configuration that might vary is left // connections created by this Network. Configuration that might vary is left
// until openConnection() and passed as arguments. // until openConnection() and passed as arguments.
HttpURLConnectionFactory urlConnectionFactory = new HttpURLConnectionFactory(); HttpURLConnectionFactory urlConnectionFactory = HttpURLConnectionFactory.createInstance();
urlConnectionFactory.setDns(dnsLookup); // Let traffic go via dnsLookup urlConnectionFactory.setDns(dnsLookup); // Let traffic go via dnsLookup
// A private connection pool just for this Network. // A private connection pool just for this Network.
urlConnectionFactory.setNewConnectionPool(httpMaxConnections, urlConnectionFactory.setNewConnectionPool(httpMaxConnections,