Enable use of http proxy. (28ad8f25) · Commits · e / os / android_frameworks_base

core/java/android/net/http/RequestQueue.java

+6 −9

Original line number	Diff line number	Diff line
		@@ -237,6 +237,7 @@ public class RequestQueue implements RequestFeeder {
		mContext.registerReceiver(mProxyChangeReceiver,
		new IntentFilter(Proxy.PROXY_CHANGE_ACTION));
		}
		setProxyConfig();
		}

		/**
		@@ -258,9 +259,6 @@ public class RequestQueue implements RequestFeeder {
		*/
		private synchronized void setProxyConfig() {
		NetworkInfo info = mConnectivityManager.getActiveNetworkInfo();
		if (info != null && info.getType() == ConnectivityManager.TYPE_WIFI) {
		mProxyHost = null;
		} else {
		String host = Proxy.getHost(mContext);
		if (HttpLog.LOGV) HttpLog.v("RequestQueue.setProxyConfig " + host);
		if (host == null) {
		@@ -270,7 +268,6 @@ public class RequestQueue implements RequestFeeder {
		mProxyHost = new HttpHost(host, Proxy.getPort(mContext), "http");
		}
		}
		}

		/**
		* used by webkit