Merge "Remove unused AndroidProxySelectorRoutePlanner" (99013a24) · Commits · e / os / android_frameworks_base

core/java/android/net/Proxy.java

+0 −42

Original line number	Original line	Diff line number	Diff line
	@@ -274,48 +274,6 @@ public final class Proxy {
	return PROXY_VALID;		return PROXY_VALID;
	}		}

	static class AndroidProxySelectorRoutePlanner
	extends org.apache.http.impl.conn.ProxySelectorRoutePlanner {

	private Context mContext;

	public AndroidProxySelectorRoutePlanner(SchemeRegistry schreg, ProxySelector prosel,
	Context context) {
	super(schreg, prosel);
	mContext = context;
	}

	@Override
	protected java.net.Proxy chooseProxy(List<java.net.Proxy> proxies, HttpHost target,
	HttpRequest request, HttpContext context) {
	return getProxy(mContext, target.getHostName());
	}

	@Override
	protected HttpHost determineProxy(HttpHost target, HttpRequest request,
	HttpContext context) {
	return getPreferredHttpHost(mContext, target.getHostName());
	}

	@Override
	public HttpRoute determineRoute(HttpHost target, HttpRequest request,
	HttpContext context) {
	HttpHost proxy = getPreferredHttpHost(mContext, target.getHostName());
	if (proxy == null) {
	return new HttpRoute(target);
	} else {
	return new HttpRoute(target, null, proxy, false);
	}
	}
	}

	/** @hide */
	public static final HttpRoutePlanner getAndroidProxySelectorRoutePlanner(Context context) {
	AndroidProxySelectorRoutePlanner ret = new AndroidProxySelectorRoutePlanner(
	new SchemeRegistry(), ProxySelector.getDefault(), context);
	return ret;
	}

	/** @hide */		/** @hide */
	public static final void setHttpProxySystemProperty(ProxyProperties p) {		public static final void setHttpProxySystemProperty(ProxyProperties p) {
	String host = null;		String host = null;