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

Merge "Move apache specific portions of android.net.http to external/apache-http."

Browse Source
This commit is contained in:
Narayan Kamath
2015-02-13 09:51:41 +00:00
committed by Android (Google) Code Review
parent 472032a647 9a87ca5691
commit 3473245e45
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/ProxyInfo.java
View File

@@ -21,8 +21,6 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils; import android.text.TextUtils;
import org.apache.http.client.HttpClient;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.URLConnection; import java.net.URLConnection;
import java.util.List; import java.util.List;
@@ -31,8 +29,9 @@ import java.util.Locale;
/** /**
* Describes a proxy configuration. * Describes a proxy configuration.
* *
* Proxy configurations are already integrated within the Apache HTTP stack. * Proxy configurations are already integrated within the {@code java.net} and
* So {@link URLConnection} and {@link HttpClient} will use them automatically. * Apache HTTP stack. So {@link URLConnection} and Apache's {@code HttpClient} will use
* them automatically.
* *
* Other HTTP stacks will need to obtain the proxy info from * Other HTTP stacks will need to obtain the proxy info from
* {@link Proxy#PROXY_CHANGE_ACTION} broadcast as the extra {@link Proxy#EXTRA_PROXY_INFO}. * {@link Proxy#PROXY_CHANGE_ACTION} broadcast as the extra {@link Proxy#EXTRA_PROXY_INFO}.