am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""

* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""

diff --cc core/java/android/net/Proxy.java
index 418093b,8efedfe..c391eb8
--- 1/core/java/android/net/Proxy.java
--- 2/core/java/android/net/Proxy.java
+++ b/core/java/android/net/Proxy.java
@@@ -261,57 -225,16 +226,15 @@@ public final class Proxy 
              try {
                  portVal = Integer.parseInt(port);
              } catch (NumberFormatException ex) {
 -                throw new IllegalArgumentException();
 -            }
 -            if (portVal <= 0 || portVal > 0xFFFF) {
 -                throw new IllegalArgumentException();
 +                return PROXY_PORT_INVALID;
              }
 +            if (portVal <= 0 || portVal > 0xFFFF) return PROXY_PORT_INVALID;
          }
 +        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 */
 -    public static final void setHttpProxySystemProperty(ProxyProperties p) {
 +    public static final void setHttpProxySystemProperty(ProxyInfo p) {
          String host = null;
          String port = null;
          String exclList = null;