Merge "Deprecate more apache-http." into lmp-mr1-dev (fa36b36c) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -17161,7 +17161,7 @@ package android.net {
		field public static final java.lang.String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE";
		}

		public class ProxyInfo implements android.os.Parcelable {
		public deprecated class ProxyInfo implements android.os.Parcelable {
		method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int);
		method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int, java.util.List<java.lang.String>);
		method public static android.net.ProxyInfo buildPacProxy(android.net.Uri);
		@@ -17208,7 +17208,7 @@ package android.net {
		method public static javax.net.SocketFactory getDefault(int);
		method public static javax.net.ssl.SSLSocketFactory getDefault(int, android.net.SSLSessionCache);
		method public java.lang.String[] getDefaultCipherSuites();
		method public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
		method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
		method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache);
		method public byte[] getNpnSelectedProtocol(java.net.Socket);
		method public java.lang.String[] getSupportedCipherSuites();
		@@ -17426,7 +17426,7 @@ package android.net {

		package android.net.http {

		public final class AndroidHttpClient implements org.apache.http.client.HttpClient {
		public final deprecated class AndroidHttpClient implements org.apache.http.client.HttpClient {
		method public void close();
		method public void disableCurlLogging();
		method public void enableCurlLogging(java.lang.String, int);
		@@ -17444,8 +17444,8 @@ package android.net.http {
		method public org.apache.http.params.HttpParams getParams();
		method public static java.io.InputStream getUngzippedContent(org.apache.http.HttpEntity) throws java.io.IOException;
		method public static void modifyRequestToAcceptGzipResponse(org.apache.http.HttpRequest);
		method public static android.net.http.AndroidHttpClient newInstance(java.lang.String, android.content.Context);
		method public static android.net.http.AndroidHttpClient newInstance(java.lang.String);
		method public static deprecated android.net.http.AndroidHttpClient newInstance(java.lang.String, android.content.Context);
		method public static deprecated android.net.http.AndroidHttpClient newInstance(java.lang.String);
		method public static long parseDate(java.lang.String);
		field public static long DEFAULT_SYNC_MIN_GZIP_BYTES;
		}

core/java/android/net/Proxy.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -19,17 +19,10 @@ package android.net;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.content.Context;
		import android.net.ProxyInfo;
		import android.text.TextUtils;
		import android.util.Log;


		import org.apache.http.HttpHost;
		import org.apache.http.HttpRequest;
		import org.apache.http.conn.routing.HttpRoute;
		import org.apache.http.conn.routing.HttpRoutePlanner;
		import org.apache.http.conn.scheme.SchemeRegistry;
		import org.apache.http.protocol.HttpContext;

		import java.net.InetSocketAddress;
		import java.net.ProxySelector;
		@@ -212,6 +205,7 @@ public final class Proxy {
		* is no proxy.
		* {@hide}
		*/
		// TODO: Get rid of this method. It's used only in tests.
		public static final HttpHost getPreferredHttpHost(Context context,
		String url) {
		java.net.Proxy prefProxy = getProxy(context, url);

core/java/android/net/ProxyInfo.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -36,7 +36,13 @@ import java.util.Locale;
		*
		* 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}.
		*
		* @deprecated Please use {@link java.net.URL#openConnection}, {@link java.net.Proxy} and
		* friends. The Apache HTTP client is no longer maintained and may be removed in a future
		* release. Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
		* for further details.
		*/
		@Deprecated
		public class ProxyInfo implements Parcelable {

		private String mHost;

core/java/android/net/SSLCertificateSocketFactory.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -154,7 +154,13 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
		* for none. The socket timeout is reset to 0 after the handshake.
		* @param cache The {@link SSLSessionCache} to use, or null for no cache.
		* @return a new SocketFactory with the specified parameters
		*
		* @deprecated Use {@link #getDefault()} along with a {@link javax.net.ssl.HttpsURLConnection}
		* instead. The Apache HTTP client is no longer maintained and may be removed in a future
		* release. Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
		* for further details.
		*/
		@Deprecated
		public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(
		int handshakeTimeoutMillis, SSLSessionCache cache) {
		return new org.apache.http.conn.ssl.SSLSocketFactory(

core/java/android/net/http/AndroidHttpClient.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -74,7 +74,13 @@ import java.util.zip.GZIPOutputStream;
		* To retain cookies, simply add a cookie store to the HttpContext:</p>
		*
		* <pre>context.setAttribute(ClientContext.COOKIE_STORE, cookieStore);</pre>
		*
		* @deprecated Please use {@link java.net.URLConnection} and friends instead.
		* The Apache HTTP client is no longer maintained and may be removed in a future
		* release. Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
		* for further details.
		*/
		@Deprecated
		public final class AndroidHttpClient implements HttpClient {

		// Gzip of data shorter than this probably won't be worthwhile
		@@ -108,7 +114,13 @@ public final class AndroidHttpClient implements HttpClient {
		* @param userAgent to report in your HTTP requests
		* @param context to use for caching SSL sessions (may be null for no caching)
		* @return AndroidHttpClient for you to use for all your requests.
		*
		* @deprecated Please use {@link java.net.URLConnection} and friends instead. See
		* {@link android.net.SSLCertificateSocketFactory} for SSL cache support. If you'd
		* like to set a custom useragent, please use {@link java.net.URLConnection#setRequestProperty(String, String)}
		* with {@code field} set to {@code User-Agent}.
		*/
		@Deprecated
		public static AndroidHttpClient newInstance(String userAgent, Context context) {
		HttpParams params = new BasicHttpParams();

		@@ -148,7 +160,13 @@ public final class AndroidHttpClient implements HttpClient {
		* Create a new HttpClient with reasonable defaults (which you can update).
		* @param userAgent to report in your HTTP requests.
		* @return AndroidHttpClient for you to use for all your requests.
		*
		* @deprecated Please use {@link java.net.URLConnection} and friends instead. See
		* {@link android.net.SSLCertificateSocketFactory} for SSL cache support. If you'd
		* like to set a custom useragent, please use {@link java.net.URLConnection#setRequestProperty(String, String)}
		* with {@code field} set to {@code User-Agent}.
		*/
		@Deprecated
		public static AndroidHttpClient newInstance(String userAgent) {
		return newInstance(userAgent, null /* session cache */);
		}